@apteva/apteva-kit 0.1.39 → 0.1.41

package/dist/index.js

@@ -1290,21 +1290,50 @@ function Message({ message, onAction, enableWidgets, onWidgetRender }) {
       return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MarkdownContent, { content: text });
     }
     const parsed = parseWidgetsFromText(text);
-    if (parsed.segments.length === 0) {
+    const cleanedText = parsed.segments.filter((seg) => seg.type === "text" && seg.content).map((seg) => seg.content).join("");
+    if (!cleanedText.trim()) {
       return null;
     }
-    return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _jsxruntime.Fragment, { children: parsed.segments.map((segment, index) => {
+    return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MarkdownContent, { content: cleanedText });
+  };
+  const renderContentWithWidgets = () => {
+    if (!enableWidgets || isUser || !message.content) {
+      return null;
+    }
+    const parsed = parseWidgetsFromText(message.content);
+    const elements = [];
+    let textBuffer = "";
+    parsed.segments.forEach((segment, index) => {
       if (segment.type === "text" && segment.content) {
-        return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MarkdownContent, { content: segment.content }, `text-${index}`);
-      }
-      if (segment.type === "widget" && segment.widget) {
-        return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "my-3", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WidgetRenderer, { widget: segment.widget, onAction }) }, `widget-${index}`);
-      }
-      if (segment.type === "widget_pending" && segment.pendingType) {
-        return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "my-3", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WidgetSkeleton, { type: segment.pendingType }) }, `pending-${index}`);
+        textBuffer += segment.content;
+      } else if (segment.type === "widget" && segment.widget) {
+        if (textBuffer.trim()) {
+          elements.push(
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-bubble apteva-message-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-content-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MarkdownContent, { content: textBuffer }) }) }, `text-${index}`)
+          );
+          textBuffer = "";
+        }
+        elements.push(
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-widget-standalone", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WidgetRenderer, { widget: segment.widget, onAction }) }, `widget-${index}`)
+        );
+      } else if (segment.type === "widget_pending" && segment.pendingType) {
+        if (textBuffer.trim()) {
+          elements.push(
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-bubble apteva-message-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-content-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MarkdownContent, { content: textBuffer }) }) }, `text-${index}`)
+          );
+          textBuffer = "";
+        }
+        elements.push(
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-widget-standalone", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WidgetSkeleton, { type: segment.pendingType }) }, `pending-${index}`)
+        );
       }
-      return null;
-    }) });
+    });
+    if (textBuffer.trim()) {
+      elements.push(
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-bubble apteva-message-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-content-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MarkdownContent, { content: textBuffer }) }) }, "text-final")
+      );
+    }
+    return elements.length > 0 ? elements : null;
   };
   const renderContent = () => {
     if (isUser) {
@@ -1322,6 +1351,45 @@ function Message({ message, onAction, enableWidgets, onWidgetRender }) {
     }
     return renderTextContent(message.content);
   };
+  const renderTextSegmentWithWidgets = (text, keyPrefix) => {
+    if (!enableWidgets) {
+      return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-bubble apteva-message-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-content-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MarkdownContent, { content: text }) }) }, keyPrefix);
+    }
+    const parsed = parseWidgetsFromText(text);
+    const elements = [];
+    let textBuffer = "";
+    parsed.segments.forEach((seg, idx) => {
+      if (seg.type === "text" && seg.content) {
+        textBuffer += seg.content;
+      } else if (seg.type === "widget" && seg.widget) {
+        if (textBuffer.trim()) {
+          elements.push(
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-bubble apteva-message-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-content-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MarkdownContent, { content: textBuffer }) }) }, `${keyPrefix}-text-${idx}`)
+          );
+          textBuffer = "";
+        }
+        elements.push(
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-widget-standalone", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WidgetRenderer, { widget: seg.widget, onAction }) }, `${keyPrefix}-widget-${idx}`)
+        );
+      } else if (seg.type === "widget_pending" && seg.pendingType) {
+        if (textBuffer.trim()) {
+          elements.push(
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-bubble apteva-message-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-content-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MarkdownContent, { content: textBuffer }) }) }, `${keyPrefix}-text-${idx}`)
+          );
+          textBuffer = "";
+        }
+        elements.push(
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-widget-standalone", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WidgetSkeleton, { type: seg.pendingType }) }, `${keyPrefix}-pending-${idx}`)
+        );
+      }
+    });
+    if (textBuffer.trim()) {
+      elements.push(
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-bubble apteva-message-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-content-assistant", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MarkdownContent, { content: textBuffer }) }) }, `${keyPrefix}-text-final`)
+      );
+    }
+    return elements;
+  };
   const renderSegmentedContent = () => {
     if (!contentSegments || contentSegments.length === 0) {
       return null;
@@ -1329,16 +1397,12 @@ function Message({ message, onAction, enableWidgets, onWidgetRender }) {
     const elements = [];
     contentSegments.forEach((segment, index) => {
       if (segment.type === "text" && segment.content) {
-        elements.push(
-          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-            "div",
-            {
-              className: "apteva-message-bubble apteva-message-assistant",
-              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-content-assistant", children: renderTextContent(segment.content) })
-            },
-            `text-${index}`
-          )
-        );
+        const textElements = renderTextSegmentWithWidgets(segment.content, `seg-${index}`);
+        if (Array.isArray(textElements)) {
+          elements.push(...textElements);
+        } else {
+          elements.push(textElements);
+        }
       } else if (segment.type === "tool") {
         elements.push(
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-tool-call-standalone", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
@@ -1356,7 +1420,15 @@ function Message({ message, onAction, enableWidgets, onWidgetRender }) {
   if (!isUser && contentSegments && contentSegments.length > 0) {
     return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "apteva-message-segmented", children: [
       renderSegmentedContent(),
-      message.widgets && message.widgets.length > 0 && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-widgets", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Widgets, { widgets: message.widgets, onAction, layout: "stack" }) }),
+      message.widgets && message.widgets.length > 0 && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-widget-standalone", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Widgets, { widgets: message.widgets, onAction, layout: "stack" }) }),
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-timestamp apteva-message-timestamp-assistant", suppressHydrationWarning: true, children: message.timestamp.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) })
+    ] });
+  }
+  const widgetContent = renderContentWithWidgets();
+  if (!isUser && enableWidgets && widgetContent) {
+    return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "apteva-message-segmented", children: [
+      widgetContent,
+      message.widgets && message.widgets.length > 0 && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-widget-standalone", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Widgets, { widgets: message.widgets, onAction, layout: "stack" }) }),
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-timestamp apteva-message-timestamp-assistant", suppressHydrationWarning: true, children: message.timestamp.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) })
     ] });
   }
@@ -1369,7 +1441,7 @@ function Message({ message, onAction, enableWidgets, onWidgetRender }) {
       ),
       children: [
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: isUser ? "apteva-message-content-user" : "apteva-message-content-assistant", children: renderContent() }),
-        message.widgets && message.widgets.length > 0 && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-message-widgets", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Widgets, { widgets: message.widgets, onAction, layout: "stack" }) }),
+        message.widgets && message.widgets.length > 0 && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "apteva-widget-standalone", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Widgets, { widgets: message.widgets, onAction, layout: "stack" }) }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: cn("apteva-message-timestamp", isUser ? "apteva-message-timestamp-user" : "apteva-message-timestamp-assistant"), suppressHydrationWarning: true, children: message.timestamp.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) })
       ]
     }