diff --git a/src/main/presenter/threadPresenter/index.ts b/src/main/presenter/threadPresenter/index.ts index 3da9d3c64..11bdb3c1d 100644 --- a/src/main/presenter/threadPresenter/index.ts +++ b/src/main/presenter/threadPresenter/index.ts @@ -1744,7 +1744,7 @@ export class ThreadPresenter implements IThreadPresenter { imageFiles.reduce((acc, file) => acc + file.token, 0) } } - // console.log('preparePromptContent', mergedMessages, promptTokens) + console.log('preparePromptContent', mergedMessages, promptTokens) return { finalContent: mergedMessages, promptTokens } } @@ -1815,21 +1815,21 @@ export class ThreadPresenter implements IThreadPresenter { ): ChatMessage[] { const formattedMessages: ChatMessage[] = [] + // 添加上下文消息 + formattedMessages.push( + ...this.addContextMessages(contextMessages, vision, supportsFunctionCall) + ) + // 添加系统提示 if (systemPrompt) { // formattedMessages.push(...this.addSystemPrompt(formattedMessages, systemPrompt, artifacts)) - formattedMessages.push({ + formattedMessages.unshift({ role: 'system', content: systemPrompt }) // console.log('-------------> system prompt \n', systemPrompt, artifacts, formattedMessages) } - // 添加上下文消息 - formattedMessages.push( - ...this.addContextMessages(formattedMessages, contextMessages, vision, supportsFunctionCall) - ) - // 添加当前用户消息 let finalContent = searchPrompt || userContent @@ -1872,12 +1872,11 @@ export class ThreadPresenter implements IThreadPresenter { // 添加上下文消息 private addContextMessages( - formattedMessages: ChatMessage[], contextMessages: Message[], vision: boolean, supportsFunctionCall: boolean ): ChatMessage[] { - const resultMessages = [...formattedMessages] + const resultMessages = [] as ChatMessage[] // 对于原生fc模型,支持正确的tool_call response history插入 if (supportsFunctionCall) {