Skip to content

Revert "improvement(mothership): show continue options on abort" #3756

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
icecrasher321 merged 1 commit into from
Mar 25, 2026
Merged

Revert "improvement(mothership): show continue options on abort" #3756

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,9 @@ export function MessageContent({
return (
<div key={`stopped-${i}`} className='flex items-center gap-[8px]'>
<CircleStop className='h-[16px] w-[16px] flex-shrink-0 text-[var(--text-icon)]' />
<span className='font-base text-[14px] text-[var(--text-body)]'>Stopped</span>
<span className='font-base text-[14px] text-[var(--text-body)]'>
Stopped by user
</span>
</div>
)
}
Expand Down
79 changes: 21 additions & 58 deletions apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ const STATE_TO_STATUS: Record<string, ToolCallStatus> = {
const DEPLOY_TOOL_NAMES = new Set(['deploy_api', 'deploy_chat', 'deploy_mcp', 'redeploy'])
const RECONNECT_TAIL_ERROR =
'Live reconnect failed before the stream finished. The latest response may be incomplete.'
const CONTINUE_OPTIONS_CONTENT =
'<options>{"continue":{"title":"Continue","description":"Pick up where we left off"}}</options>'

function mapStoredBlock(block: TaskStoredContentBlock): ContentBlock {
const mapped: ContentBlock = {
Expand Down Expand Up @@ -1215,22 +1213,16 @@ export function useChat(

if (storedBlocks.length > 0) {
storedBlocks.push({ type: 'stopped' })
storedBlocks.push({ type: 'text', content: CONTINUE_OPTIONS_CONTENT })
}

const persistedContent =
content && !content.includes('<options>')
? `${content}\n\n${CONTINUE_OPTIONS_CONTENT}`
: content

try {
const res = await fetch(stopPathRef.current, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
chatId,
streamId,
content: persistedContent,
content,
...(storedBlocks.length > 0 && { contentBlocks: storedBlocks }),
}),
})
Expand All @@ -1256,50 +1248,6 @@ export function useChat(
const messagesRef = useRef(messages)
messagesRef.current = messages

const resolveInterruptedToolCalls = useCallback(() => {
setMessages((prev) => {
const hasAnyExecuting = prev.some((m) =>
m.contentBlocks?.some((b) => b.toolCall?.status === 'executing')
)
if (!hasAnyExecuting) return prev

let lastAssistantIdx = -1
for (let i = prev.length - 1; i >= 0; i--) {
if (prev[i].role === 'assistant') {
lastAssistantIdx = i
break
}
}
return prev.map((msg, idx) => {
const hasExecuting = msg.contentBlocks?.some((b) => b.toolCall?.status === 'executing')
const isLastAssistant = idx === lastAssistantIdx
if (!hasExecuting && !isLastAssistant) return msg

const blocks: ContentBlock[] = (msg.contentBlocks ?? []).map((block) => {
if (block.toolCall?.status !== 'executing') return block
return {
...block,
toolCall: {
...block.toolCall,
status: 'cancelled' as const,
displayTitle: 'Stopped',
},
}
})
if (isLastAssistant && !blocks.some((b) => b.type === 'stopped')) {
blocks.push({ type: 'stopped' as const })
}
if (
isLastAssistant &&
!blocks.some((b) => b.type === 'text' && b.content?.includes('<options>'))
) {
blocks.push({ type: 'text', content: CONTINUE_OPTIONS_CONTENT })
}
return { ...msg, contentBlocks: blocks.length > 0 ? blocks : msg.contentBlocks }
})
})
}, [])

const finalize = useCallback(
(options?: { error?: boolean }) => {
sendingRef.current = false
Expand All @@ -1314,8 +1262,6 @@ export function useChat(
}
}

resolveInterruptedToolCalls()

if (options?.error) {
setMessageQueue([])
return
Expand All @@ -1331,7 +1277,7 @@ export function useChat(
})
}
},
[invalidateChatQueries, resolveInterruptedToolCalls]
[invalidateChatQueries]
)
finalizeRef.current = finalize

Expand Down Expand Up @@ -1489,7 +1435,24 @@ export function useChat(
sendingRef.current = false
setIsSending(false)

resolveInterruptedToolCalls()
setMessages((prev) =>
prev.map((msg) => {
if (!msg.contentBlocks?.some((b) => b.toolCall?.status === 'executing')) return msg
const updated = msg.contentBlocks!.map((block) => {
if (block.toolCall?.status !== 'executing') return block
return {
...block,
toolCall: {
...block.toolCall,
status: 'cancelled' as const,
displayTitle: 'Stopped by user',
},
}
})
updated.push({ type: 'stopped' as const })
return { ...msg, contentBlocks: updated }
})
)
Comment on lines +1438 to +1455
Copy link
Contributor

@greptile-apps greptile-apps bot Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 stopped block added to every interrupted message, not just the last

The removed resolveInterruptedToolCalls was careful to append the stopped block only to the last assistant message and included a dedup guard (!blocks.some((b) => b.type === 'stopped')). The new inline logic unconditionally calls updated.push({ type: 'stopped' as const }) for every message that contains an 'executing' tool call.

In practice a single stream produces at most one assistant message with live tool calls, so the divergence is unlikely to trigger. But if prior assistant messages somehow retain an 'executing' status (e.g. after a reconnect or partial restore), each of them would receive its own stopped block, potentially rendering duplicate stop indicators in the UI. Adding the same dedup guard keeps the behaviour consistent with the pre-revert code:

Suggested change
setMessages((prev) =>
prev.map((msg) => {
if (!msg.contentBlocks?.some((b) => b.toolCall?.status === 'executing')) return msg
const updated = msg.contentBlocks!.map((block) => {
if (block.toolCall?.status !== 'executing') return block
return {
...block,
toolCall: {
...block.toolCall,
status: 'cancelled' as const,
displayTitle: 'Stopped by user',
},
}
})
updated.push({ type: 'stopped' as const })
return { ...msg, contentBlocks: updated }
})
)
setMessages((prev) =>
prev.map((msg) => {
if (!msg.contentBlocks?.some((b) => b.toolCall?.status === 'executing')) return msg
const updated = msg.contentBlocks!.map((block) => {
if (block.toolCall?.status !== 'executing') return block
return {
...block,
toolCall: {
...block.toolCall,
status: 'cancelled' as const,
displayTitle: 'Stopped by user',
},
}
})
if (!updated.some((b) => b.type === 'stopped')) {
updated.push({ type: 'stopped' as const })
}
return { ...msg, contentBlocks: updated }
})
)


if (sid) {
fetch('/api/copilot/chat/abort', {
Expand Down Expand Up @@ -1555,7 +1518,7 @@ export function useChat(

reportManualRunToolStop(workflowId, toolCallId).catch(() => {})
}
}, [invalidateChatQueries, persistPartialResponse, executionStream, resolveInterruptedToolCalls])
}, [invalidateChatQueries, persistPartialResponse, executionStream])

const removeFromQueue = useCallback((id: string) => {
messageQueueRef.current = messageQueueRef.current.filter((m) => m.id !== id)
Expand Down
1 change: 1 addition & 0 deletions bun.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading