function rename - splice guard

Author: emrberk

src/providers/AIConversationProvider/index.tsx

@@ -104,7 +104,9 @@ type AIConversationContextType = {
     messageId: string,
     updates: Partial<ConversationMessage>,
   ) => void
-  replaceConversationMessages: (newMessages: Array<ConversationMessage>) => void
+  updateMessagesWithCompaction: (
+    newMessages: Array<ConversationMessage>,
+  ) => void
   updateConversationName: (
     conversationId: ConversationId,
     name: string,
@@ -484,7 +486,7 @@ export const AIConversationProvider: React.FC<{
     [conversationMetas],
   )
 
-  const replaceConversationMessages = useCallback(
+  const updateMessagesWithCompaction = useCallback(
     (newMessages: Array<ConversationMessage>) => {
       setActiveConversationMessages((prev) => {
         const conversationMessages = [...prev]
@@ -498,11 +500,14 @@ export const AIConversationProvider: React.FC<{
             conversationMessages[index] = message
           }
         }
-        conversationMessages.splice(
-          lastReplaceIndex + 1,
-          0,
-          newMessages[newMessages.length - 1],
-        )
+        // Insert the compaction summary message
+        const lastNewMessage = newMessages[newMessages.length - 1]
+        if (
+          lastNewMessage &&
+          !conversationMessages.some((m) => m.id === lastNewMessage.id)
+        ) {
+          conversationMessages.splice(lastReplaceIndex + 1, 0, lastNewMessage)
+        }
         return conversationMessages
       })
     },
@@ -621,6 +626,7 @@ export const AIConversationProvider: React.FC<{
         void trackEvent(ConsoleEvent.AI_CHAT_OPEN)
       } finally {
         isOpeningChatWindowRef.current = false
+        setIsLoadingMessages(false)
       }
     },
     [
@@ -1049,7 +1055,7 @@ export const AIConversationProvider: React.FC<{
         addMessage,
         removeMessages,
         updateMessage,
-        replaceConversationMessages,
+        updateMessagesWithCompaction,
         updateConversationName,
         acceptSuggestion,
         rejectSuggestion,

src/scenes/Editor/AIChatWindow/index.tsx

@@ -213,7 +213,7 @@ const AIChatWindow: React.FC = () => {
     addMessage,
     removeMessages,
     updateMessage,
-    replaceConversationMessages,
+    updateMessagesWithCompaction,
     updateConversationName,
     acceptSuggestion,
     rejectSuggestion,
@@ -420,7 +420,7 @@ const AIChatWindow: React.FC = () => {
         setIsStreaming,
         persistMessages,
         updateConversationName,
-        replaceConversationMessages,
+        updateMessagesWithCompaction,
       },
     )
   }
@@ -659,7 +659,7 @@ const AIChatWindow: React.FC = () => {
         setIsStreaming,
         persistMessages,
         updateConversationName,
-        replaceConversationMessages,
+        updateMessagesWithCompaction,
       }
 
       switch (userMessage.displayType) {
@@ -782,7 +782,7 @@ const AIChatWindow: React.FC = () => {
       setIsStreaming,
       persistMessages,
       updateConversationName,
-      replaceConversationMessages,
+      updateMessagesWithCompaction,
       currentSQL,
     ],
   )

src/utils/executeAIFlow.ts

@@ -126,7 +126,7 @@ export type AIFlowCallbacks = {
     name: string,
     isGeneratedByAI?: boolean,
   ) => Promise<void>
-  replaceConversationMessages?: (messages: ConversationMessage[]) => void
+  updateMessagesWithCompaction?: (messages: ConversationMessage[]) => void
   getLastRoundMessages?: (conversationId: ConversationId) => Promise<{
     lastUserMessage?: ConversationMessage
     lastAssistantMessage?: ConversationMessage
@@ -289,8 +289,8 @@ function processResult(config: ProcessResultConfig): AIFlowResult {
     return { success: false, error: errorMessage }
   }
 
-  if (compactedHistory && callbacks.replaceConversationMessages) {
-    callbacks.replaceConversationMessages(compactedHistory)
+  if (compactedHistory && callbacks.updateMessagesWithCompaction) {
+    callbacks.updateMessagesWithCompaction(compactedHistory)
   }
 
   const hasSQLInResult = response.sql && response.sql.trim() !== ""