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

fix(TopicRenaming): captured activeTopic.id is outdated and causes accidental topic changing after renaming (#7157)

Browse Source 
* fix(TopicRenaming): captured activeTopic.id is outdated and causes accidental topic changing after renaming

* fix: prevent topic changing on auto renaming

* fix: filter out main text on summarizing
This commit is contained in:
one 2025-06-13 17:24:24 +08:00 committed by GitHub
parent faf14ff10b
commit c7fd1ac373
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/renderer/src/hooks/useTopic.ts
View File

@ -121,7 +121,7 @@ export const autoRenameTopic = async (assistant: Assistant, topicId: string) =>
startTopicRenaming(topicId) startTopicRenaming(topicId)
const data = { ...topic, name: topicName } as Topic const data = { ...topic, name: topicName } as Topic
_setActiveTopic(data) topic.id === _activeTopic.id && _setActiveTopic(data)
store.dispatch(updateTopic({ assistantId: assistant.id, topic: data })) store.dispatch(updateTopic({ assistantId: assistant.id, topic: data }))
} finally { } finally {
finishTopicRenaming(topicId) finishTopicRenaming(topicId)
@ -138,7 +138,7 @@ export const autoRenameTopic = async (assistant: Assistant, topicId: string) =>
const summaryText = await fetchMessagesSummary({ messages: topic.messages, assistant }) const summaryText = await fetchMessagesSummary({ messages: topic.messages, assistant })
if (summaryText) { if (summaryText) {
const data = { ...topic, name: summaryText } const data = { ...topic, name: summaryText }
_setActiveTopic(data) topic.id === _activeTopic.id && _setActiveTopic(data)
store.dispatch(updateTopic({ assistantId: assistant.id, topic: data })) store.dispatch(updateTopic({ assistantId: assistant.id, topic: data }))
} }
} finally { } finally {

2
src/renderer/src/pages/home/Tabs/TopicsTab.tsx
View File

@ -197,7 +197,6 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
if (summaryText) { if (summaryText) {
const updatedTopic = { ...topic, name: summaryText, isNameManuallyEdited: false } const updatedTopic = { ...topic, name: summaryText, isNameManuallyEdited: false }
updateTopic(updatedTopic) updateTopic(updatedTopic)
topic.id === activeTopic.id && setActiveTopic(updatedTopic)
} else { } else {
window.message?.error(t('message.error.fetchTopicName')) window.message?.error(t('message.error.fetchTopicName'))
} }
@ -221,7 +220,6 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
if (name && topic?.name !== name) { if (name && topic?.name !== name) {
const updatedTopic = { ...topic, name, isNameManuallyEdited: true } const updatedTopic = { ...topic, name, isNameManuallyEdited: true }
updateTopic(updatedTopic) updateTopic(updatedTopic)
topic.id === activeTopic.id && setActiveTopic(updatedTopic)
} }
} }
}, },

5
src/renderer/src/services/ApiService.ts
View File

@ -416,7 +416,10 @@ export async function fetchTranslate({ content, assistant, onResponse }: FetchTr
export async function fetchMessagesSummary({ messages, assistant }: { messages: Message[]; assistant: Assistant }) { export async function fetchMessagesSummary({ messages, assistant }: { messages: Message[]; assistant: Assistant }) {
const prompt = (getStoreSetting('topicNamingPrompt') as string) || i18n.t('prompts.title') const prompt = (getStoreSetting('topicNamingPrompt') as string) || i18n.t('prompts.title')
const model = getTopNamingModel() || assistant.model || getDefaultModel() const model = getTopNamingModel() || assistant.model || getDefaultModel()
const userMessages = takeRight(messages, 5) const userMessages = takeRight(messages, 5).map((message) => ({
...message,
content: getMainTextContent(message)
}))
const provider = getProviderByModel(model) const provider = getProviderByModel(model)