@flamingo-stack/openframe-frontend-core 0.0.249 → 0.0.250

package/dist/{chunk-PCXI7ZB2.js → chunk-D2BC3NZ2.js}

@@ -2924,12 +2924,15 @@ var ChatMessageList = forwardRef12(
     onLoadMoreRef.current = onLoadMore;
     const isFetchingRef = useRef3(isFetchingNextPage);
     isFetchingRef.current = isFetchingNextPage;
+    const dialogIdRef = useRef3(dialogId);
+    dialogIdRef.current = dialogId;
     const prevRenderRef = useRef3({ dialogId: void 0, messageCount: 0, lastMessageId: void 0 });
-    const prependRef = useRef3({ firstMessageId: void 0, firstMessageContent: void 0, scrollHeight: 0 });
+    const loadOlderAnchorRef = useRef3(null);
     useEffect3(() => {
       if (!autoScroll) return;
       const dialogChanged = dialogId !== prevRenderRef.current.dialogId;
       const prevCount = prevRenderRef.current.messageCount;
+      const prevLastId = prevRenderRef.current.lastMessageId;
       const newCount = messages.length;
       const currentLastId = messages[messages.length - 1]?.id;
       prevRenderRef.current = { dialogId, messageCount: newCount, lastMessageId: currentLastId };
@@ -2942,7 +2945,8 @@ var ChatMessageList = forwardRef12(
         return;
       }
       if (newCount > prevCount) {
-        const newSlice = messages.slice(prevCount);
+        const prevLastIdx = prevLastId ? messages.findIndex((m) => m.id === prevLastId) : -1;
+        const newSlice = prevLastIdx >= 0 ? messages.slice(prevLastIdx + 1) : messages.slice(prevCount);
         const hasNewUser = newSlice.some((m) => m.role === "user");
         if (hasNewUser) {
           void scrollToBottom({ animation: "instant", ignoreEscapes: true });
@@ -2966,34 +2970,17 @@ var ChatMessageList = forwardRef12(
     }, [autoScroll, messages, dialogId, scrollToBottom, contentRef]);
     useLayoutEffect2(() => {
       const el = scrollRef.current;
-      if (!el) {
-        prependRef.current = { firstMessageId: void 0, firstMessageContent: void 0, scrollHeight: 0 };
+      const anchor = loadOlderAnchorRef.current;
+      if (!el || !anchor) return;
+      if (anchor.dialogId !== dialogId) {
+        loadOlderAnchorRef.current = null;
         return;
       }
-      const currentFirstId = messages[0]?.id;
-      const currentFirstContent = messages[0]?.content;
-      const prevFirstId = prependRef.current.firstMessageId;
-      const prevHeight = prependRef.current.scrollHeight;
-      if (currentFirstId !== prevFirstId) {
-        if (prevFirstId && prevHeight > 0) {
-          const prevIdx = messages.findIndex((m) => m.id === prevFirstId);
-          if (prevIdx > 0) {
-            const addedHeight = el.scrollHeight - prevHeight;
-            if (addedHeight > 0) el.scrollTop += addedHeight;
-          }
-        }
-        prependRef.current = {
-          firstMessageId: currentFirstId,
-          firstMessageContent: currentFirstContent,
-          scrollHeight: el.scrollHeight
-        };
-        return;
-      }
-      prependRef.current.scrollHeight = el.scrollHeight;
-      if (currentFirstContent !== prependRef.current.firstMessageContent) {
-        prependRef.current.firstMessageContent = currentFirstContent;
-      }
-    }, [messages, scrollRef]);
+      const addedHeight = el.scrollHeight - anchor.scrollHeight;
+      if (addedHeight <= 0) return;
+      loadOlderAnchorRef.current = null;
+      el.scrollTop = anchor.scrollTop + addedHeight;
+    }, [messages, dialogId, scrollRef]);
     const messageElsRef = useRef3(/* @__PURE__ */ new Map());
     const refCallbacksRef = useRef3(/* @__PURE__ */ new Map());
     const getRegisterMessageEl = (id) => {
@@ -3065,6 +3052,14 @@ var ChatMessageList = forwardRef12(
           const entry = entries[0];
           if (!entry) return;
           if (entry.isIntersecting && !isFetchingRef.current) {
+            const el = scrollRef.current;
+            if (el) {
+              loadOlderAnchorRef.current = {
+                dialogId: dialogIdRef.current,
+                scrollHeight: el.scrollHeight,
+                scrollTop: el.scrollTop
+              };
+            }
             onLoadMoreRef.current?.();
           }
         },
@@ -3072,7 +3067,7 @@ var ChatMessageList = forwardRef12(
       );
       observer.observe(sentinelElement);
       return () => observer.disconnect();
-    }, [hasNextPage, scrollRef]);
+    }, [hasNextPage, isFetchingNextPage, scrollRef]);
     useImperativeHandle2(ref, () => scrollRef.current, [scrollRef]);
     if (isLoading) {
       return /* @__PURE__ */ jsx22(
@@ -20247,6 +20242,7 @@ var CategorySection = ({
           /* @__PURE__ */ jsx175(
             Button,
             {
+              type: "button",
               variant: "transparent",
               onClick: (e) => {
                 e.stopPropagation();
@@ -37808,6 +37804,110 @@ function extractIncompleteMessageState(lastMessage) {
   };
 }
 
+// src/components/chat/utils/history-merge.ts
+var SYNTHETIC_REALTIME_ID_PREFIXES = ["assistant-", "user-", "error-"];
+function isSyntheticRealtimeId(id) {
+  return SYNTHETIC_REALTIME_ID_PREFIXES.some((prefix) => id.startsWith(prefix));
+}
+function flattenMessagePagesChronological(pages) {
+  if (!pages) return [];
+  return [...pages].reverse().flatMap((page) => [...page.messages].reverse());
+}
+function maxPersistedStreamSeq(pages) {
+  let max = 0;
+  if (!pages) return max;
+  for (const page of pages) {
+    for (const msg of page.messages) {
+      const seq = msg.lastChunkStreamSeq;
+      if (typeof seq === "number" && seq > max) max = seq;
+    }
+  }
+  return max;
+}
+function mergeHistoryWithRealtime(input) {
+  const {
+    processedHistory,
+    rawHistoryIds,
+    existingMessages,
+    streamingMessageId,
+    historyFetchedAt,
+    historyMaxStreamSeq = 0,
+    realtimeSeenStreamSeq = 0
+  } = input;
+  if (processedHistory.length === 0) return existingMessages;
+  const processedIds = new Set(processedHistory.map((m) => m.id));
+  const seqCoverageKnown = realtimeSeenStreamSeq > 0 && historyMaxStreamSeq > 0;
+  const historyCoversRealtime = seqCoverageKnown ? historyMaxStreamSeq >= realtimeSeenStreamSeq : null;
+  const trailing = processedHistory[processedHistory.length - 1];
+  const historyTrailingAssistant = trailing?.role === "assistant" ? trailing : null;
+  const historyBatchId = historyTrailingAssistant && Array.isArray(historyTrailingAssistant.content) ? historyTrailingAssistant.content.find((s) => s.type === "approval_batch")?.data?.approvalRequestId ?? null : null;
+  let processedToUse = processedHistory;
+  const pinnedSyntheticIds = /* @__PURE__ */ new Set();
+  const droppedSyntheticIds = /* @__PURE__ */ new Set();
+  if (historyBatchId) {
+    const batchTwins = existingMessages.filter(
+      (m) => m.role === "assistant" && Array.isArray(m.content) && m.content.some(
+        (s) => s.type === "approval_batch" && s.data?.approvalRequestId === historyBatchId
+      )
+    );
+    const existingWithSameBatch = batchTwins.find((m) => m.id === streamingMessageId) ?? batchTwins[batchTwins.length - 1];
+    if (existingWithSameBatch && Array.isArray(existingWithSameBatch.content)) {
+      const histSize = Array.isArray(historyTrailingAssistant?.content) ? historyTrailingAssistant.content.length : 0;
+      const realtimeSize = existingWithSameBatch.content.length;
+      if (existingWithSameBatch.id === streamingMessageId || realtimeSize > histSize) {
+        processedToUse = processedHistory.slice(0, -1);
+        pinnedSyntheticIds.add(existingWithSameBatch.id);
+      } else {
+        droppedSyntheticIds.add(existingWithSameBatch.id);
+      }
+    }
+  }
+  const realtimeMessages = existingMessages.filter((m) => {
+    if (pinnedSyntheticIds.has(m.id)) return true;
+    if (droppedSyntheticIds.has(m.id)) return false;
+    if (processedIds.has(m.id)) return false;
+    if (rawHistoryIds?.has(m.id)) return false;
+    if (m.role === "user" && m.id.startsWith("optimistic-") && typeof m.content === "string") {
+      const canBeInSnapshot = (m.timestamp?.getTime() ?? 0) <= historyFetchedAt;
+      return !(canBeInSnapshot && processedToUse.some((pm) => pm.role === "user" && pm.content === m.content));
+    }
+    if (isSyntheticRealtimeId(m.id) && m.id !== streamingMessageId) {
+      const covered = historyCoversRealtime !== null ? historyCoversRealtime : (m.timestamp?.getTime() ?? 0) <= historyFetchedAt;
+      if (covered) return false;
+    }
+    return true;
+  });
+  return [...processedToUse, ...realtimeMessages];
+}
+function computeHistoryPrepend(processedHistory, existingMessages) {
+  const existingIds = new Set(existingMessages.map((m) => m.id));
+  const newMessages = [];
+  let boundaryMessageIndex = -1;
+  for (let i = 0; i < processedHistory.length; i++) {
+    if (existingIds.has(processedHistory[i].id)) {
+      boundaryMessageIndex = i;
+      break;
+    }
+    newMessages.push(processedHistory[i]);
+  }
+  let boundaryMessageId;
+  let boundaryUpdates;
+  if (boundaryMessageIndex >= 0) {
+    const boundaryMessage = processedHistory[boundaryMessageIndex];
+    const existingBoundary = existingMessages.find((m) => m.id === boundaryMessage.id);
+    if (existingBoundary) {
+      const existingContent = JSON.stringify(existingBoundary.content);
+      const newContent = JSON.stringify(boundaryMessage.content);
+      if (existingContent !== newContent) {
+        boundaryMessageId = boundaryMessage.id;
+        boundaryUpdates = { content: boundaryMessage.content };
+      }
+    }
+  }
+  if (newMessages.length === 0 && !boundaryUpdates) return null;
+  return { newMessages, boundaryMessageId, boundaryUpdates };
+}
+
 // src/components/chat/utils/chip-action-class.ts
 var CHIP_ACTION_BUTTON_CLASS = "text-[11px] font-medium text-ods-text-secondary hover:text-ods-text-primary bg-transparent hover:bg-ods-card-hover border border-ods-border rounded-md px-2 py-1 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ods-focus";
 
@@ -39283,6 +39383,11 @@ export {
   useNatsChatAdapter,
   useUnifiedChat,
   extractIncompleteMessageState,
+  SYNTHETIC_REALTIME_ID_PREFIXES,
+  flattenMessagePagesChronological,
+  maxPersistedStreamSeq,
+  mergeHistoryWithRealtime,
+  computeHistoryPrepend,
   CHIP_ACTION_BUTTON_CLASS,
   chatChipClass,
   clickupTaskUrl,
@@ -39610,4 +39715,4 @@ export {
   LogsList,
   assets
 };
-//# sourceMappingURL=chunk-PCXI7ZB2.js.map
+//# sourceMappingURL=chunk-D2BC3NZ2.js.map