Skip to content

fix(formatMessage): system prompt is spliced ​​twice #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zerob13 merged 1 commit into from
Jul 7, 2025
Merged

fix(formatMessage): system prompt is spliced ​​twice #581

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/main/presenter/threadPresenter/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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) {
Expand Down