fix(chat): preserve request options when editing queued messages

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.mount-send.test.tsx

@@ -339,6 +339,41 @@ describe('useChat remount send recovery', () => {
     vi.clearAllMocks()
   })
 
+  it.each([
+    { options: undefined, expectedSource: 'drive' },
+    { options: { assistantSearch: { source: 'slack' } }, expectedSource: 'slack' },
+  ])(
+    'preserves queued assistant mode when edited with $options',
+    async ({ options, expectedSource }) => {
+      useMothershipQueueStore.setState({
+        queues: {
+          'chat-a': [
+            {
+              id: 'queued-question',
+              content: 'Find the policy',
+              requestMode: 'assistant',
+              assistantSearch: { source: 'drive' },
+            },
+          ],
+        },
+        editing: { 'chat-a': 'queued-question' },
+      })
+      const { getResult } = renderUseChatInChat('chat-a')
+
+      await act(async () => {
+        await getResult().sendMessage('Find the updated policy', undefined, undefined, options)
+      })
+      await waitFor(() => state.postBodies.length === 1)
+
+      expect(state.postBodies[0]).toMatchObject({
+        message: 'Find the updated policy',
+        mode: 'assistant',
+        assistantSearch: { source: expectedSource },
+      })
+      expect(useMothershipQueueStore.getState().editing['chat-a']).toBeUndefined()
+    }
+  )
+
   it('keeps a cross-route handoff recoverable across a StrictMode double-mount', async () => {
     MothershipHandoffStorage.store({ message: 'investigate this failed run' }, 'ws-1')
 

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -4396,14 +4396,14 @@ export function useChat(
       // Edit-in-place: replace at the original index. If the slot was already
       // dispatched mid-edit (UI-guard race), fall through to a tail-append.
       if (editingId) {
-        const existing = queueStore.queues[activeChatKey] ?? []
-        if (existing.some((m) => m.id === editingId)) {
+        const existing = queueStore.queues[activeChatKey]?.find((m) => m.id === editingId)
+        if (existing) {
           queueStore.replaceAt(activeChatKey, editingId, {
             content: message,
             fileAttachments,
             contexts,
-            requestMode: options?.requestMode,
-            assistantSearch: options?.assistantSearch,
+            requestMode: options?.requestMode ?? existing.requestMode,
+            assistantSearch: options?.assistantSearch ?? existing.assistantSearch,
           })
           queueStore.setEditing(activeChatKey, null)
           // Resume dispatch if it paused on this slot.