Fix queue

Author: Sg312

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-checkpoint-management.ts

@@ -94,7 +94,6 @@ export function useCheckpointManagement(
 
         setShowRestoreConfirmation(false)
         onRevertModeChange?.(false)
-        onEditModeChange?.(true)
 
         logger.info('Checkpoint reverted and removed from message', {
           messageId: message.id,
@@ -108,15 +107,7 @@ export function useCheckpointManagement(
         setIsReverting(false)
       }
     }
-  }, [
-    messageCheckpoints,
-    revertToCheckpoint,
-    message.id,
-    messages,
-    currentChat,
-    onRevertModeChange,
-    onEditModeChange,
-  ])
+  }, [messageCheckpoints, revertToCheckpoint, message.id, messages, currentChat, onRevertModeChange])
 
   /**
    * Cancels checkpoint revert
@@ -176,6 +167,7 @@ export function useCheckpointManagement(
             fileAttachments: fileAttachments || message.fileAttachments,
             contexts: contexts || (message as any).contexts,
             messageId: message.id,
+            queueIfBusy: false,
           })
         }
         pendingEditRef.current = null
@@ -219,6 +211,7 @@ export function useCheckpointManagement(
           fileAttachments: fileAttachments || message.fileAttachments,
           contexts: contexts || (message as any).contexts,
           messageId: message.id,
+          queueIfBusy: false,
         })
       }
       pendingEditRef.current = null

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-editing.ts

@@ -166,6 +166,7 @@ export function useMessageEditing(props: UseMessageEditingProps) {
           fileAttachments: fileAttachments || message.fileAttachments,
           contexts: contexts || (message as any).contexts,
           messageId: message.id,
+          queueIfBusy: false,
         })
       }
     },

apps/sim/stores/panel/copilot/store.ts

@@ -2562,16 +2562,18 @@ export const useCopilotStore = create<CopilotStore>()(
         fileAttachments,
         contexts,
         messageId,
+        queueIfBusy = true,
       } = options as {
         stream?: boolean
         fileAttachments?: MessageFileAttachment[]
         contexts?: ChatContext[]
         messageId?: string
+        queueIfBusy?: boolean
       }
 
       if (!workflowId) return
 
-      // If already sending a message, queue this one instead
+      // If already sending a message, queue this one instead unless bypassing queue
       if (isSendingMessage && !activeAbortController) {
         logger.warn('[Copilot] sendMessage: stale sending state detected, clearing', {
           originalMessageId: messageId,
@@ -2583,12 +2585,15 @@ export const useCopilotStore = create<CopilotStore>()(
         })
         set({ isSendingMessage: false, abortController: null })
       } else if (isSendingMessage) {
-        get().addToQueue(message, { fileAttachments, contexts, messageId })
-        logger.info('[Copilot] Message queued (already sending)', {
-          queueLength: get().messageQueue.length + 1,
-          originalMessageId: messageId,
-        })
-        return
+        if (queueIfBusy) {
+          get().addToQueue(message, { fileAttachments, contexts, messageId })
+          logger.info('[Copilot] Message queued (already sending)', {
+            queueLength: get().messageQueue.length + 1,
+            originalMessageId: messageId,
+          })
+          return
+        }
+        get().abortMessage({ suppressContinueOption: true })
       }
 
       const nextAbortController = new AbortController()

apps/sim/stores/panel/copilot/types.ts

@@ -179,6 +179,7 @@ export interface CopilotActions {
       fileAttachments?: MessageFileAttachment[]
       contexts?: ChatContext[]
       messageId?: string
+      queueIfBusy?: boolean
     }
   ) => Promise<void>
   abortMessage: (options?: { suppressContinueOption?: boolean }) => void