Skip to content

fixed duplicate thoughts #334

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

Open
arkml wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fixed duplicate thoughts #334

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
70 changes: 38 additions & 32 deletions apps/x/apps/renderer/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1113,16 +1113,18 @@ function App() {
if (llmEvent.type === 'reasoning-delta' && llmEvent.delta) {
setCurrentReasoning(prev => prev + llmEvent.delta)
} else if (llmEvent.type === 'reasoning-end') {
setCurrentReasoning(reasoning => {
if (reasoning) {
setConversation(prev => [...prev, {
id: `reasoning-${Date.now()}`,
content: reasoning,
timestamp: Date.now(),
}])
}
let reasoningContent = ''
setCurrentReasoning(prev => {
reasoningContent = prev
return ''
})
if (reasoningContent) {
setConversation(prev => [...prev, {
id: `reasoning-${Date.now()}`,
content: reasoningContent,
timestamp: Date.now(),
}])
}
} else if (llmEvent.type === 'text-delta' && llmEvent.delta) {
setCurrentAssistantMessage(prev => prev + llmEvent.delta)
} else if (llmEvent.type === 'tool-call') {
Expand All @@ -1146,23 +1148,25 @@ function App() {
{
const msg = event.message
if (msg.role === 'assistant') {
setCurrentAssistantMessage(currentMsg => {
if (currentMsg) {
setConversation(prev => {
const exists = prev.some(m =>
m.id === event.messageId && 'role' in m && m.role === 'assistant'
)
if (exists) return prev
return [...prev, {
id: event.messageId,
role: 'assistant',
content: currentMsg,
timestamp: Date.now(),
}]
})
}
let assistantContent = ''
setCurrentAssistantMessage(prev => {
assistantContent = prev
return ''
})
if (assistantContent) {
setConversation(prev => {
const exists = prev.some(m =>
m.id === event.messageId && 'role' in m && m.role === 'assistant'
)
if (exists) return prev
return [...prev, {
id: event.messageId,
role: 'assistant',
content: assistantContent,
timestamp: Date.now(),
}]
})
}
}
}
break
Expand Down Expand Up @@ -1285,17 +1289,19 @@ function App() {
setPendingPermissionRequests(new Map())
setPendingAskHumanRequests(new Map())
// Flush any streaming content as a message
setCurrentAssistantMessage(currentMsg => {
if (currentMsg) {
setConversation(prev => [...prev, {
id: `assistant-stopped-${Date.now()}`,
role: 'assistant',
content: currentMsg,
timestamp: Date.now(),
}])
}
let stoppedMsg = ''
setCurrentAssistantMessage(prev => {
stoppedMsg = prev
return ''
})
if (stoppedMsg) {
setConversation(prev => [...prev, {
id: `assistant-stopped-${Date.now()}`,
role: 'assistant',
content: stoppedMsg,
timestamp: Date.now(),
}])
}
setCurrentReasoning('')
break

Expand Down