Skip to content

improvement(mothership): message queueing for home chat #3576

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
waleedlatif1 merged 10 commits into from
Mar 14, 2026
Merged

improvement(mothership): message queueing for home chat #3576

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8610d67
improvement(mothership): message queueing for home chat
waleedlatif1 Mar 14, 2026
7456c3c
fix(mothership): address PR review — move FileAttachmentForApi to typ…
waleedlatif1 Mar 14, 2026
84ad165
fix(mothership): replace updater side-effect with useEffect ref sync,…
waleedlatif1 Mar 14, 2026
67d328d
fix(mothership): clear message queue on chat switch while sending
waleedlatif1 Mar 14, 2026
3f17446
fix(mothership): remove stale isSending from handleKeyDown deps
waleedlatif1 Mar 14, 2026
d8ad8a4
fix(mothership): guard sendNow against double-click duplicate sends
waleedlatif1 Mar 14, 2026
af7a2a8
fix(mothership): simplify queue callbacks — drop redundant deps and g…
waleedlatif1 Mar 14, 2026
71a83af
fix(mothership): clear edit value on nav, stop queue drain on send fa…
waleedlatif1 Mar 14, 2026
8c0fe13
fix(mothership): eagerly update messageQueueRef in removeFromQueue
waleedlatif1 Mar 14, 2026
ad0d418
fix(mothership): mark onSendNow as explicit fire-and-forget
waleedlatif1 Mar 14, 2026
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
Prev Previous commit
Next Next commit
fix(mothership): simplify queue callbacks — drop redundant deps and g… 
…uard ref

- Remove `setMessageQueue` from useCallback deps (stable setter, never changes)
- Replace `sendNowProcessingRef` double-click guard with eager `messageQueueRef` update
- Simplify `editQueuedMessage` with same eager-ref pattern for consistency

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
  • Loading branch information
@waleedlatif1 @claude
waleedlatif1 and claude committed Mar 14, 2026
commit af7a2a8860b4e5e76554f005e5871185c7780a3a
44 changes: 17 additions & 27 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 @@ -741,7 +741,7 @@ export function useChat(
sendMessageRef.current(next.content, next.fileAttachments, next.contexts)
})
}
}, [invalidateChatQueries, setMessageQueue])
}, [invalidateChatQueries])

useEffect(() => {
const activeStreamId = chatHistory?.activeStreamId
Expand Down Expand Up @@ -999,41 +999,31 @@ export function useChat(
}
}, [invalidateChatQueries, persistPartialResponse, executionStream])

const removeFromQueue = useCallback(
(id: string) => {
setMessageQueue((prev) => prev.filter((m) => m.id !== id))
},
[setMessageQueue]
)
const removeFromQueue = useCallback((id: string) => {
setMessageQueue((prev) => prev.filter((m) => m.id !== id))
}, [])
Comment thread
waleedlatif1 marked this conversation as resolved.

const sendNowProcessingRef = useRef<string | null>(null)
const sendNow = useCallback(
async (id: string) => {
if (sendNowProcessingRef.current === id) return
const msg = messageQueueRef.current.find((m) => m.id === id)
if (!msg) return
sendNowProcessingRef.current = id
try {
await stopGeneration()
setMessageQueue((prev) => prev.filter((m) => m.id !== id))
await sendMessage(msg.content, msg.fileAttachments, msg.contexts)
} finally {
sendNowProcessingRef.current = null
}
},
[stopGeneration, sendMessage, setMessageQueue]
)

const editQueuedMessage = useCallback(
(id: string): QueuedMessage | undefined => {
const msg = messageQueueRef.current.find((m) => m.id === id)
if (!msg) return undefined
// Eagerly update ref so a rapid second click finds the message already gone
messageQueueRef.current = messageQueueRef.current.filter((m) => m.id !== id)
await stopGeneration()
setMessageQueue((prev) => prev.filter((m) => m.id !== id))
return msg
await sendMessage(msg.content, msg.fileAttachments, msg.contexts)
},
[setMessageQueue]
[stopGeneration, sendMessage]
)
Comment thread
waleedlatif1 marked this conversation as resolved.

const editQueuedMessage = useCallback((id: string): QueuedMessage | undefined => {
const msg = messageQueueRef.current.find((m) => m.id === id)
if (!msg) return undefined
messageQueueRef.current = messageQueueRef.current.filter((m) => m.id !== id)
setMessageQueue((prev) => prev.filter((m) => m.id !== id))
return msg
}, [])

useEffect(() => {
return () => {
streamGenRef.current++
Expand Down
Loading