@copilotz/chat-ui 0.6.4 → 0.6.5

package/dist/index.cjs

@@ -543,6 +543,7 @@ var CollapsibleContent2 = CollapsiblePrimitive.CollapsibleContent;
 var import_lucide_react = require("lucide-react");
 var import_jsx_runtime7 = require("react/jsx-runtime");
 var ROOT_SPACING_CLASS = "mb-4 w-full max-w-full min-w-0";
+var ACTION_SLOT_CLASS = "inline-flex h-9 min-w-[132px] items-center justify-end px-2 text-xs";
 var interpolate = (template, replacements) => Object.entries(replacements).reduce(
   (output, [key, value]) => output.replaceAll(`{{${key}}}`, String(value ?? "")),
   template
@@ -617,15 +618,15 @@ var ActivitySummaryRow = (0, import_react.memo)(function ActivitySummaryRow2({
   hasDetails,
   open
 }) {
-  if (!hasDetails) {
-    return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { className: "block w-full min-w-0", children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ActivitySummaryCard, { activity, labels }) });
-  }
   return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { className: "grid w-full min-w-0 grid-cols-[minmax(0,1fr)_auto] items-center gap-2", children: [
     /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { className: "min-w-0", children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ActivitySummaryCard, { activity, labels }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(CollapsibleTrigger2, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(Button, { variant: "ghost", size: "sm", className: "h-9 shrink-0 px-2 text-xs text-muted-foreground", children: [
+    hasDetails ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(CollapsibleTrigger2, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(Button, { variant: "ghost", size: "sm", className: cn(ACTION_SLOT_CLASS, "shrink-0 text-muted-foreground"), children: [
       open ? labels?.activityHideDetails || "Hide details" : labels?.activityShowDetails || "Show details",
       open ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_lucide_react.ChevronDown, { className: "ml-1 h-3.5 w-3.5" }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_lucide_react.ChevronRight, { className: "ml-1 h-3.5 w-3.5" })
-    ] }) })
+    ] }) }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { "aria-hidden": "true", className: cn(ACTION_SLOT_CLASS, "pointer-events-none invisible shrink-0"), children: [
+      labels?.activityShowDetails || "Show details",
+      /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_lucide_react.ChevronRight, { className: "ml-1 h-3.5 w-3.5" })
+    ] })
   ] });
 });
 var ActivityDetails = (0, import_react.memo)(function ActivityDetails2({
@@ -689,21 +690,26 @@ var AssistantActivity = (0, import_react.memo)(function AssistantActivity2({
       setOpen(true);
     }
   }, [activity.isActive, hasDetails]);
-  if (!hasDetails) {
-    return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { className: ROOT_SPACING_CLASS, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ActivitySummaryCard, { activity, labels }) });
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Collapsible, { open, onOpenChange: setOpen, className: ROOT_SPACING_CLASS, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { className: "space-y-2", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
-      ActivitySummaryRow,
-      {
-        activity,
-        labels,
-        hasDetails,
-        open
-      }
-    ),
-    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(CollapsibleContent2, { className: "w-full overflow-hidden rounded-lg border border-border/60 bg-muted/10 px-3", children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ActivityDetails, { activity }) })
-  ] }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+    Collapsible,
+    {
+      open: hasDetails ? open : false,
+      onOpenChange: hasDetails ? setOpen : void 0,
+      className: ROOT_SPACING_CLASS,
+      children: /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { className: "space-y-2", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+          ActivitySummaryRow,
+          {
+            activity,
+            labels,
+            hasDetails,
+            open
+          }
+        ),
+        hasDetails && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(CollapsibleContent2, { className: "w-full overflow-hidden rounded-lg border border-border/60 bg-muted/10 px-3", children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ActivityDetails, { activity }) })
+      ] })
+    }
+  );
 });
 
 // src/components/chat/Message.tsx
@@ -5041,6 +5047,25 @@ function getMessageSpeakerKey(message) {
   }
   return message.role;
 }
+function getAssistantSpeakerTokens(message) {
+  if (!message || message.role !== "assistant") return [];
+  const rawTokens = [message.senderAgentId, message.senderName].filter((value) => typeof value === "string" && value.trim().length > 0).map((value) => value.trim().toLowerCase());
+  if (rawTokens.length > 0) {
+    return Array.from(new Set(rawTokens));
+  }
+  return ["assistant"];
+}
+function canGroupMessages(previous, next) {
+  if (previous.role !== next.role) {
+    return false;
+  }
+  if (previous.role !== "assistant") {
+    return getMessageSpeakerKey(previous) === getMessageSpeakerKey(next);
+  }
+  const previousTokens = getAssistantSpeakerTokens(previous);
+  const nextTokens = getAssistantSpeakerTokens(next);
+  return previousTokens.some((token) => nextTokens.includes(token));
+}
 var mergeToolCalls = (activities) => {
   const merged = /* @__PURE__ */ new Map();
   for (const activity of activities) {
@@ -5106,7 +5131,7 @@ var groupMessagesForRender = (messages) => {
   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)) {
+    if (canGroupMessages(previous, next)) {
       currentGroup.push(next);
       continue;
     }