From 5918f800d785895f852661632ab1218934c4d1dd Mon Sep 17 00:00:00 2001 From: SuYao Date: Fri, 25 Jul 2025 16:42:03 +0800 Subject: [PATCH] fix/mcp-bug (#8518) * fix/mcp-bug * chore: upgrade version * refactor: remove optional --- .../src/services/StreamProcessingService.ts | 2 +- src/renderer/src/store/index.ts | 2 +- src/renderer/src/store/migrate.ts | 13 +++++++++++++ src/renderer/src/types/index.ts | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/renderer/src/services/StreamProcessingService.ts b/src/renderer/src/services/StreamProcessingService.ts index 3288a67c71..4861e5b11a 100644 --- a/src/renderer/src/services/StreamProcessingService.ts +++ b/src/renderer/src/services/StreamProcessingService.ts @@ -51,7 +51,7 @@ export function createStreamProcessor(callbacks: StreamProcessorCallbacks = {}) return (chunk: Chunk) => { try { const data = chunk - // console.log('data: ', chunk) + logger.debug('data: ', data) switch (data.type) { case ChunkType.BLOCK_COMPLETE: { if (callbacks.onComplete) callbacks.onComplete(AssistantMessageStatus.SUCCESS, data?.response) diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts index 9288d87fff..5860871235 100644 --- a/src/renderer/src/store/index.ts +++ b/src/renderer/src/store/index.ts @@ -58,7 +58,7 @@ const persistedReducer = persistReducer( { key: 'cherry-studio', storage, - version: 123, + version: 124, blacklist: ['runtime', 'messages', 'messageBlocks', 'tabs'], migrate }, diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts index 9803f89f55..bddf1d9a1e 100644 --- a/src/renderer/src/store/migrate.ts +++ b/src/renderer/src/store/migrate.ts @@ -1869,6 +1869,19 @@ const migrateConfig = { logger.error('migrate 123 error', error as Error) return state } + }, // 1.5.4 + '124': (state: RootState) => { + try { + state.assistants.assistants.forEach((assistant) => { + if (assistant.settings && !assistant.settings.toolUseMode) { + assistant.settings.toolUseMode = 'prompt' + } + }) + return state + } catch (error) { + logger.error('migrate 124 error', error as Error) + return state + } } } diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts index 163da0eb63..1c2386b86a 100644 --- a/src/renderer/src/types/index.ts +++ b/src/renderer/src/types/index.ts @@ -68,7 +68,7 @@ export type AssistantSettings = { customParameters?: AssistantSettingCustomParameters[] reasoning_effort?: ReasoningEffortOptions qwenThinkMode?: boolean - toolUseMode?: 'function' | 'prompt' + toolUseMode: 'function' | 'prompt' } export type Agent = Omit & {