Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-07 22:10:21 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

feat(SelectionAssistant): support thinking block in action window (#6998)

Browse Source 
feat(ActionUtils): enhance message processing to include thinking block handling
This commit is contained in:
fullex 2025-06-09 20:08:17 +08:00 committed by GitHub
parent 56d1791ae8
commit 3c97b13e99
1 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/renderer/src/windows/selection/action/components/ActionUtils.ts
View File

@ -7,7 +7,7 @@ import { Assistant, Topic } from '@renderer/types'
import { Chunk, ChunkType } from '@renderer/types/chunk' import { Chunk, ChunkType } from '@renderer/types/chunk'
import { AssistantMessageStatus, MessageBlockStatus } from '@renderer/types/newMessage' import { AssistantMessageStatus, MessageBlockStatus } from '@renderer/types/newMessage'
import { isAbortError } from '@renderer/utils/error' import { isAbortError } from '@renderer/utils/error'
import { createMainTextBlock } from '@renderer/utils/messageUtils/create' import { createMainTextBlock, createThinkingBlock } from '@renderer/utils/messageUtils/create'
export const processMessages = async ( export const processMessages = async (
assistant: Assistant, assistant: Assistant,
@ -32,8 +32,11 @@ export const processMessages = async (
store.dispatch(newMessagesActions.addMessage({ topicId: topic.id, message: userMessage })) store.dispatch(newMessagesActions.addMessage({ topicId: topic.id, message: userMessage }))
store.dispatch(upsertManyBlocks(userBlocks)) store.dispatch(upsertManyBlocks(userBlocks))
let blockId: string | null = null let textBlockId: string | null = null
let blockContent: string = '' let textBlockContent: string = ''
let thinkingBlockId: string | null = null
let thinkingBlockContent: string = ''
const assistantMessage = getAssistantMessage({ const assistantMessage = getAssistantMessage({
assistant, assistant,
@ -52,17 +55,14 @@ export const processMessages = async (
onChunkReceived: (chunk: Chunk) => { onChunkReceived: (chunk: Chunk) => {
switch (chunk.type) { switch (chunk.type) {
case ChunkType.THINKING_DELTA: case ChunkType.THINKING_DELTA:
case ChunkType.THINKING_COMPLETE:
//TODO
break
case ChunkType.TEXT_DELTA:
{ {
blockContent += chunk.text thinkingBlockContent += chunk.text
if (!blockId) { if (!thinkingBlockId) {
const block = createMainTextBlock(assistantMessage.id, chunk.text, { const block = createThinkingBlock(assistantMessage.id, chunk.text, {
status: MessageBlockStatus.STREAMING status: MessageBlockStatus.STREAMING,
thinking_millsec: chunk.thinking_millsec
}) })
blockId = block.id thinkingBlockId = block.id
store.dispatch( store.dispatch(
newMessagesActions.updateMessage({ newMessagesActions.updateMessage({
topicId: topic.id, topicId: topic.id,
@ -72,7 +72,46 @@ export const processMessages = async (
) )
store.dispatch(upsertOneBlock(block)) store.dispatch(upsertOneBlock(block))
} else { } else {
store.dispatch(updateOneBlock({ id: blockId, changes: { content: blockContent } })) store.dispatch(
updateOneBlock({
id: thinkingBlockId,
changes: { content: thinkingBlockContent, thinking_millsec: chunk.thinking_millsec }
})
)
}
onStream()
}
break
case ChunkType.THINKING_COMPLETE:
{
if (thinkingBlockId) {
store.dispatch(
updateOneBlock({
id: thinkingBlockId,
changes: { status: MessageBlockStatus.SUCCESS, thinking_millsec: chunk.thinking_millsec }
})
)
}
}
break
case ChunkType.TEXT_DELTA:
{
textBlockContent += chunk.text
if (!textBlockId) {
const block = createMainTextBlock(assistantMessage.id, chunk.text, {
status: MessageBlockStatus.STREAMING
})
textBlockId = block.id
store.dispatch(
newMessagesActions.updateMessage({
topicId: topic.id,
messageId: assistantMessage.id,
updates: { blockInstruction: { id: block.id } }
})
)
store.dispatch(upsertOneBlock(block))
} else {
store.dispatch(updateOneBlock({ id: textBlockId, changes: { content: textBlockContent } }))
} }
onStream() onStream()
@ -80,10 +119,10 @@ export const processMessages = async (
break break
case ChunkType.TEXT_COMPLETE: case ChunkType.TEXT_COMPLETE:
{ {
blockId && textBlockId &&
store.dispatch( store.dispatch(
updateOneBlock({ updateOneBlock({
id: blockId, id: textBlockId,
changes: { status: MessageBlockStatus.SUCCESS } changes: { status: MessageBlockStatus.SUCCESS }
}) })
) )
@ -94,12 +133,12 @@ export const processMessages = async (
updates: { status: AssistantMessageStatus.SUCCESS } updates: { status: AssistantMessageStatus.SUCCESS }
}) })
) )
blockContent = chunk.text textBlockContent = chunk.text
} }
break break
case ChunkType.BLOCK_COMPLETE: case ChunkType.BLOCK_COMPLETE:
case ChunkType.ERROR: case ChunkType.ERROR:
onFinish(blockContent) onFinish(textBlockContent)
break break
} }
} }