@copilotz/chat-ui 0.5.0 → 0.6.1

package/dist/index.js

@@ -845,7 +845,6 @@ var arePropsEqual = (prevProps, nextProps) => {
   if (prevProps.markdown !== nextProps.markdown) return false;
   if (prevProps.isExpanded !== nextProps.isExpanded) return false;
   if (prevProps.onToggleExpanded !== nextProps.onToggleExpanded) return false;
-  if (prevProps.isGrouped !== nextProps.isGrouped) return false;
   if (prevProps.assistantAvatar !== nextProps.assistantAvatar) return false;
   return true;
 };
@@ -876,7 +875,6 @@ var Message = memo2(({
   markdown,
   isExpanded = false,
   onToggleExpanded,
-  isGrouped = false,
   agentOptions = []
 }) => {
   const [isEditing, setIsEditing] = useState2(false);
@@ -949,7 +947,7 @@ var Message = memo2(({
       onMouseEnter: () => setShowActions(true),
       onMouseLeave: () => setShowActions(false),
       children: [
-        !isGrouped && /* @__PURE__ */ jsxs3("div", { className: `flex gap-3 ${messageIsUser ? "flex-row-reverse" : "flex-row"} w-full mb-1`, children: [
+        /* @__PURE__ */ jsxs3("div", { className: `flex gap-3 ${messageIsUser ? "flex-row-reverse" : "flex-row"} w-full mb-1`, children: [
           showAvatar && /* @__PURE__ */ jsx8("div", { className: `flex-shrink-0 ${compactMode ? "mt-1" : "mt-0"}`, children: /* @__PURE__ */ jsx8(Avatar, { className: compactMode ? "h-6 w-6" : "h-8 w-8", children: messageIsUser ? /* @__PURE__ */ jsxs3(Fragment, { children: [
             /* @__PURE__ */ jsx8(AvatarImage, { src: userAvatar, alt: userName }),
             /* @__PURE__ */ jsx8(AvatarFallback, { className: "bg-primary text-primary-foreground", children: userName.charAt(0).toUpperCase() })
@@ -5029,6 +5027,81 @@ function getMessageSpeakerKey(message) {
   }
   return message.role;
 }
+var mergeToolCalls = (activities) => {
+  const merged = /* @__PURE__ */ new Map();
+  for (const activity of activities) {
+    if (!Array.isArray(activity.toolCalls)) continue;
+    for (const toolCall of activity.toolCalls) {
+      const key = toolCall.id || `${toolCall.name}:${JSON.stringify(toolCall.arguments ?? {})}`;
+      merged.set(key, toolCall);
+    }
+  }
+  return merged.size > 0 ? Array.from(merged.values()) : void 0;
+};
+var mergeReasoning = (activities) => {
+  const segments = activities.map((activity) => activity.reasoning?.trim()).filter((value) => Boolean(value));
+  if (segments.length === 0) return void 0;
+  return segments.filter((segment, index) => index === 0 || segment !== segments[index - 1]).join("\n\n");
+};
+var mergeGroupActivity = (messages) => {
+  const activities = messages.map((message) => message.activity).filter((activity) => Boolean(activity));
+  if (activities.length === 0) return void 0;
+  const lastActivity = activities[activities.length - 1];
+  const mergedReasoning = mergeReasoning(activities);
+  const mergedToolCalls = mergeToolCalls(activities);
+  return {
+    ...lastActivity,
+    ...mergedReasoning ? { reasoning: mergedReasoning } : {},
+    ...mergedToolCalls ? { toolCalls: mergedToolCalls } : {}
+  };
+};
+var mergeMessageGroup = (messages) => {
+  const firstMessage = messages[0];
+  const lastMessage = messages[messages.length - 1];
+  const content = messages.map((message) => message.content.trim()).filter((value) => value.length > 0).join("\n\n");
+  const attachments = messages.flatMap((message) => message.attachments ?? []);
+  return {
+    ...lastMessage,
+    id: lastMessage.id,
+    content,
+    timestamp: firstMessage.timestamp,
+    attachments: attachments.length > 0 ? attachments : void 0,
+    isStreaming: lastMessage.isStreaming,
+    isComplete: lastMessage.isComplete,
+    isEdited: messages.some((message) => message.isEdited),
+    originalContent: void 0,
+    editedAt: lastMessage.editedAt,
+    activity: mergeGroupActivity(messages),
+    senderName: lastMessage.senderName ?? firstMessage.senderName,
+    senderAgentId: lastMessage.senderAgentId ?? firstMessage.senderAgentId,
+    metadata: lastMessage.metadata
+  };
+};
+var groupMessagesForRender = (messages) => {
+  if (messages.length === 0) return [];
+  const groups = [];
+  let currentGroup = [messages[0]];
+  const flushGroup = () => {
+    const mergedMessage = mergeMessageGroup(currentGroup);
+    groups.push({
+      id: mergedMessage.id,
+      message: mergedMessage,
+      suggestionMessageId: currentGroup[currentGroup.length - 1].id
+    });
+  };
+  for (let index = 1; index < messages.length; index++) {
+    const previous = currentGroup[currentGroup.length - 1];
+    const next = messages[index];
+    if (previous.role === next.role && getMessageSpeakerKey(previous) === getMessageSpeakerKey(next)) {
+      currentGroup.push(next);
+      continue;
+    }
+    flushGroup();
+    currentGroup = [next];
+  }
+  flushGroup();
+  return groups;
+};
 var ChatUI = ({
   messages = [],
   threads = [],
@@ -5122,8 +5195,9 @@ var ChatUI = ({
   }, [attachments]);
   const [isCustomMounted, setIsCustomMounted] = useState9(false);
   const [isCustomVisible, setIsCustomVisible] = useState9(false);
+  const groupedMessages = useMemo6(() => groupMessagesForRender(messages), [messages]);
   const virtualizer = useVirtualizer({
-    count: messages.length,
+    count: groupedMessages.length,
     getScrollElement: () => scrollAreaRef.current,
     estimateSize: () => 100,
     overscan: 5
@@ -5161,20 +5235,20 @@ var ChatUI = ({
   }, [state.showSidebar, isMobile, config.customComponent]);
   const prevMessageCountRef = useRef6(0);
   useEffect11(() => {
-    if (messages.length === 0) {
+    if (groupedMessages.length === 0) {
       prevMessageCountRef.current = 0;
       return;
     }
     if (prependSnapshotRef.current) {
-      prevMessageCountRef.current = messages.length;
+      prevMessageCountRef.current = groupedMessages.length;
       return;
     }
     const wasEmpty = prevMessageCountRef.current === 0;
-    prevMessageCountRef.current = messages.length;
+    prevMessageCountRef.current = groupedMessages.length;
     if (wasEmpty) {
       requestAnimationFrame(() => {
         requestAnimationFrame(() => {
-          virtualizer.scrollToIndex(messages.length - 1, { align: "end" });
+          virtualizer.scrollToIndex(groupedMessages.length - 1, { align: "end" });
         });
       });
       return;
@@ -5189,7 +5263,7 @@ var ChatUI = ({
         viewport.scrollTop = viewport.scrollHeight;
       }
     });
-  }, [messages, state.isAtBottom, virtualizer]);
+  }, [groupedMessages, state.isAtBottom, virtualizer]);
   useEffect11(() => {
     virtualizer.measure();
   }, [expandedMessageIds, virtualizer]);
@@ -5199,13 +5273,13 @@ var ChatUI = ({
   useEffect11(() => {
     const snapshot = prependSnapshotRef.current;
     if (!snapshot) return;
-    if (messages.length <= snapshot.messageCount) {
+    if (groupedMessages.length <= snapshot.messageCount) {
       if (!isLoadingOlderMessages) {
         prependSnapshotRef.current = null;
       }
       return;
     }
-    if ((messages[0]?.id ?? null) === snapshot.firstMessageId) {
+    if ((groupedMessages[0]?.id ?? null) === snapshot.firstMessageId) {
       if (!isLoadingOlderMessages) {
         prependSnapshotRef.current = null;
       }
@@ -5221,20 +5295,20 @@ var ChatUI = ({
         prependSnapshotRef.current = null;
       });
     });
-  }, [messages, isLoadingOlderMessages, virtualizer]);
+  }, [groupedMessages, isLoadingOlderMessages, virtualizer]);
   const requestOlderMessages = useCallback4(() => {
     if (!onLoadOlderMessages || !hasMoreMessagesBefore || isLoadingOlderMessages) return;
     const viewport = scrollAreaRef.current;
     prependSnapshotRef.current = viewport ? {
       scrollHeight: viewport.scrollHeight,
       scrollTop: viewport.scrollTop,
-      firstMessageId: messages[0]?.id ?? null,
-      messageCount: messages.length
+      firstMessageId: groupedMessages[0]?.id ?? null,
+      messageCount: groupedMessages.length
     } : null;
     onLoadOlderMessages();
-  }, [hasMoreMessagesBefore, isLoadingOlderMessages, messages, onLoadOlderMessages]);
+  }, [groupedMessages, hasMoreMessagesBefore, isLoadingOlderMessages, onLoadOlderMessages]);
   useEffect11(() => {
-    const validMessageIds = new Set(messages.map((message) => message.id));
+    const validMessageIds = new Set(groupedMessages.map((group) => group.id));
     setExpandedMessageIds((prev) => {
       const activeIds = Object.keys(prev);
       const staleIds = activeIds.filter((messageId) => !validMessageIds.has(messageId));
@@ -5247,7 +5321,7 @@ var ChatUI = ({
       });
       return next;
     });
-  }, [messages]);
+  }, [groupedMessages]);
   const handleScroll = useCallback4((e) => {
     const { scrollTop, scrollHeight, clientHeight } = e.currentTarget;
     const isAtBottom = scrollHeight - scrollTop - clientHeight < 50;
@@ -5349,7 +5423,7 @@ var ChatUI = ({
   }, [config?.customComponent?.component, closeSidebar, isMobile]);
   const SuggestionIconComponents = [MessageSquare, Lightbulb2, Zap, HelpCircle];
   const renderSuggestions = () => {
-    if (messages.length > 0 || !suggestions.length) return null;
+    if (groupedMessages.length > 0 || !suggestions.length) return null;
     return /* @__PURE__ */ jsxs17("div", { className: "flex flex-col items-center justify-center min-h-[60vh] py-8 px-4", children: [
       /* @__PURE__ */ jsxs17("div", { className: "text-center mb-8", children: [
         /* @__PURE__ */ jsx27("div", { className: "inline-flex items-center justify-center w-14 h-14 rounded-2xl bg-gradient-to-br from-primary/20 to-primary/5 mb-4 shadow-sm", children: /* @__PURE__ */ jsx27(Sparkles2, { className: "w-7 h-7 text-primary" }) }),
@@ -5514,7 +5588,7 @@ var ChatUI = ({
               onScrollCapture: handleScroll,
               style: { contain: "strict" },
               children: /* @__PURE__ */ jsxs17("div", { className: "max-w-4xl mx-auto pb-4", children: [
-                messages.length > 0 && /* @__PURE__ */ jsx27("div", { className: "flex justify-center py-2", children: isLoadingOlderMessages ? /* @__PURE__ */ jsx27("span", { className: "text-xs text-muted-foreground", children: config.labels.loadingOlderMessages }) : hasMoreMessagesBefore ? /* @__PURE__ */ jsx27(
+                groupedMessages.length > 0 && /* @__PURE__ */ jsx27("div", { className: "flex justify-center py-2", children: isLoadingOlderMessages ? /* @__PURE__ */ jsx27("span", { className: "text-xs text-muted-foreground", children: config.labels.loadingOlderMessages }) : hasMoreMessagesBefore ? /* @__PURE__ */ jsx27(
                   "button",
                   {
                     type: "button",
@@ -5523,7 +5597,7 @@ var ChatUI = ({
                     children: config.labels.loadOlderMessages
                   }
                 ) : null }),
-                isMessagesLoading ? renderMessageLoadingSkeleton() : messages.length === 0 ? renderSuggestions() : /* @__PURE__ */ jsx27(
+                isMessagesLoading ? renderMessageLoadingSkeleton() : groupedMessages.length === 0 ? renderSuggestions() : /* @__PURE__ */ jsx27(
                   "div",
                   {
                     style: {
@@ -5532,9 +5606,8 @@ var ChatUI = ({
                       position: "relative"
                     },
                     children: virtualizer.getVirtualItems().map((virtualRow) => {
-                      const message = messages[virtualRow.index];
-                      const prevMessage = virtualRow.index > 0 ? messages[virtualRow.index - 1] : null;
-                      const isGrouped = prevMessage !== null && prevMessage.role === message.role && getMessageSpeakerKey(prevMessage) === getMessageSpeakerKey(message);
+                      const group = groupedMessages[virtualRow.index];
+                      const message = group.message;
                       return /* @__PURE__ */ jsx27(
                         "div",
                         {
@@ -5547,20 +5620,19 @@ var ChatUI = ({
                             width: "100%",
                             transform: `translateY(${virtualRow.start}px)`
                           },
-                          children: /* @__PURE__ */ jsxs17("div", { className: virtualRow.index === 0 ? "" : isGrouped ? "pt-2" : "pt-4", children: [
+                          children: /* @__PURE__ */ jsxs17("div", { className: virtualRow.index === 0 ? "" : "pt-4", children: [
                             /* @__PURE__ */ jsx27(
                               Message,
                               {
                                 message,
                                 ...messageProps,
-                                isGrouped,
                                 isExpanded: Boolean(expandedMessageIds[message.id])
                               }
                             ),
-                            message.role === "assistant" && renderInlineSuggestions(message.id)
+                            message.role === "assistant" && renderInlineSuggestions(group.suggestionMessageId)
                           ] })
                         },
-                        message.id
+                        group.id
                       );
                     })
                   }