@zero-library/chat-copilot 3.1.9 → 3.1.10

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import { CloudUploadOutlined, PaperClipOutlined, createFromIconfontCN, LoadingOutlined, EnterOutlined, DownloadOutlined, CloseOutlined, PlayCircleOutlined, CopyOutlined, DotChartOutlined, LikeOutlined, DislikeOutlined, ToolOutlined, SearchOutlined, UpOutlined, DownOutlined, PlusOutlined, CommentOutlined, RedoOutlined, DeleteOutlined, ClockCircleOutlined, CheckCircleOutlined, FileImageOutlined, FilePdfOutlined, FileWordOutlined, FileExcelOutlined, FilePptOutlined, FileZipOutlined, FileTextOutlined, FileUnknownOutlined } from '@ant-design/icons';
 import { Attachments, Sender, FileCard, Bubble, Think, XProvider, Mermaid, CodeHighlighter, Welcome, Prompts, Conversations } from '@ant-design/x-v2';
-import { useRefState, useDebounce, createTokenManager, useSyncInput, isEmptyObj, markdownToText, RenderWrapper, shouldRender, isFunction, downloadFile, LuyaFilePreview, MarkdownEditor, useDeepEffect, isObject, useWebSocket, isNullOrUnDef, isNumber, getFileSuffixName, FileIcon, copyText, LazyComponent, isBoolean, UserAvatar, htmlToMarkdown, buildUrlParams, isExternal, deepCopy, transforms, deepMerge, createRequest, HttpStatus, isArray, isString, isDef, isNull, transform, emit, getWebSocketUrl, safeParseJson } from '@zero-library/common';
+import { useRefState, useDebounce, createTokenManager, useSyncInput, isEmptyObj, markdownToText, RenderWrapper, shouldRender, isFunction, downloadFile, LuyaFilePreview, MarkdownEditor, useDeepEffect, isObject, useWebSocket, isNullOrUnDef, isNumber, getFileSuffixName, emit, FileIcon, copyText, LazyComponent, isBoolean, UserAvatar, htmlToMarkdown, buildUrlParams, isExternal, deepCopy, transforms, deepMerge, createRequest, HttpStatus, isArray, isString, isDef, isNull, transform, getWebSocketUrl, safeParseJson } from '@zero-library/common';
 import { App, Badge, Button, Flex, Typography, Tooltip, Layout, Tag, Spin, Splitter, Image as Image$1, Popover, Skeleton, Alert, theme, Collapse, Divider as Divider$1, Select as Select$1, Avatar, Space, Form, Drawer, Empty, Modal, Checkbox, Input, InputNumber, Switch as Switch$1, message, List, Upload, Card, Table, Progress as Progress$1 } from 'antd';
 import * as React10 from 'react';
 import React10__default, { createContext, forwardRef, useRef, useEffect, useImperativeHandle, useMemo, memo, useState, useContext, useCallback, useLayoutEffect } from 'react';
@@ -1327,7 +1327,7 @@ function createChatStore() {
   };
   const setConversationSpec = (spec) => {
     if (isObject(spec)) {
-      Object.assign(conversation.active.spec, spec);
+      Object.assign(conversation.active.spec || {}, spec);
     }
   };
   const setConversationUserInput = (userInput) => {
@@ -1549,11 +1549,22 @@ function createChatStore() {
     conversation.messages[msg.conversationId].loading = false;
     const messages = conversation.messages[msg.conversationId]?.message;
     if (messages) {
+      const idx = findExecutionMsgIndex(msg, messages);
+      const contentItem = msg.content[0];
       messages.forEach((item) => {
         if (item.executionId === msg.executionId) {
           item.generating = false;
         }
       });
+      if (contentItem?.type === "runFailed") {
+        if (idx !== -1) {
+          const prevContent = messages[idx]?.content || [];
+          messages[idx].content = [...prevContent, contentItem];
+        } else {
+          const finalMsg = { ...msg, generating: false };
+          messages.push(finalMsg);
+        }
+      }
     }
     config.hooks?.onAfterAcceptMessage?.(msg);
   }
@@ -2591,6 +2602,7 @@ var AgentNavigate_default = memo(({ data }) => {
   }, [data]);
   const handleClick = () => {
     if (!content?.emit) return;
+    emit(content.emit, { ...content.data, name: "luya-web-drawer" }, "nearest");
   };
   return /* @__PURE__ */ jsx(Button, { onClick: handleClick, style: { padding: 0 }, type: "link", children: content?.name || "\u70B9\u51FB\u6B64\u5904" });
 });
@@ -2801,9 +2813,7 @@ var MdEdit_default = ({ data, loading }) => {
 };
 var PreviewLink_default = ({ data, loading, message: message3, ...rest }) => {
   const chatStore = useChatStore();
-  const getLinkFileName = (href) => {
-    const url = new URL(href, window.location.origin);
-    const path = url.searchParams.get("path") || url.pathname;
+  const getLinkFileName = (path) => {
     const lastSegment = path.split("/").pop();
     if (!lastSegment) {
       return "link";
@@ -2814,24 +2824,12 @@ var PreviewLink_default = ({ data, loading, message: message3, ...rest }) => {
       return lastSegment;
     }
   };
-  const getPreviewFileUrl = (href) => {
-    return buildUrlParams({ [TOKEN_KEY]: tokenManager.get() || "" }, href);
-  };
-  const handlePreviewLink = (href) => {
-    const fileName = getLinkFileName(href);
-    const suffix = getFileSuffixName(fileName);
-    chatStore.setPreview({
-      fileUrl: getPreviewFileUrl(href),
-      fileName,
-      suffix
-    });
-  };
-  const handlePathToUrl = (href) => {
-    const fileName = getLinkFileName(href);
+  const handlePreviewByPath = (path) => {
+    const fileName = getLinkFileName(path);
     const suffix = getFileSuffixName(fileName);
     chatStore.setPreview({
       fileUrl: chatStore.config.services.request.getPreviewUrl({
-        path: href,
+        path,
         workspaceId: message3.conversationId
       }),
       fileName,
@@ -2845,12 +2843,18 @@ var PreviewLink_default = ({ data, loading, message: message3, ...rest }) => {
       return;
     }
     e.preventDefault();
-    if (String(rest.href).startsWith("/luya")) {
-      handlePreviewLink(href);
+    if (String(rest.href).startsWith("/luya") || String(rest.href).startsWith("/agents")) {
+      const url = new URL(href, window.location.origin);
+      const path = url.searchParams.get("path");
+      if (!path) {
+        window.open(href, "_blank");
+        return;
+      }
+      handlePreviewByPath(path);
       return;
     }
     if (String(rest.href).startsWith("/workspace")) {
-      handlePathToUrl(href);
+      handlePreviewByPath(href);
       return;
     }
     window.open(href, "_blank");
@@ -3359,11 +3363,8 @@ var A2uiComponents = {
 
 // src/components/CustomComponents/A2uiRuntime/controller/extract.ts
 var A2UI_TAG_REGEX = /<A2UI\s+id="([^"]*)"\s*>([\s\S]*?)<\/A2UI>/g;
-function hasA2uiTag(text) {
-  return typeof text === "string" && text.includes("<A2UI");
-}
 function parseA2uiTagsFromText(text) {
-  if (!hasA2uiTag(text)) return [];
+  if (typeof text !== "string" || !text.includes("<A2UI")) return [];
   const tags = [];
   const regex = new RegExp(A2UI_TAG_REGEX);
   let match;
@@ -3381,61 +3382,17 @@ function parseA2uiTagsFromText(text) {
   return tags;
 }
 function stripA2uiTags(text) {
-  if (!hasA2uiTag(text)) return text;
-  let result = text.replace(A2UI_TAG_REGEX, "");
-  result = result.replace(/<A2UI\b[\s\S]*$/, "");
-  return result.trim();
-}
-function splitA2uiTextSegments(text) {
-  if (typeof text !== "string" || !text.includes("<A2UI")) {
-    return text ? [{ type: "text", content: text }] : [];
-  }
-  const segments = [];
-  const regex = new RegExp(A2UI_TAG_REGEX);
-  let lastIndex = 0;
-  let match;
-  while ((match = regex.exec(text)) !== null) {
-    if (match.index > lastIndex) {
-      const before = text.slice(lastIndex, match.index);
-      if (before) segments.push({ type: "text", content: before });
-    }
-    const json = match[2].trim();
-    if (json) {
-      try {
-        const parsed = JSON.parse(json);
-        const commands = Array.isArray(parsed) ? parsed : [parsed];
-        const surfaceIds = commands.map((cmd) => String(cmd?.createSurface?.surfaceId || "").trim()).filter(Boolean);
-        if (surfaceIds.length) {
-          segments.push({ type: "a2ui", surfaceIds });
-        }
-      } catch {
-      }
-    }
-    lastIndex = regex.lastIndex;
-  }
-  if (lastIndex < text.length) {
-    let remaining = text.slice(lastIndex);
-    remaining = remaining.replace(/<A2UI\b[\s\S]*$/, "");
-    if (remaining) segments.push({ type: "text", content: remaining });
-  }
-  return segments.length ? segments : [];
+  if (typeof text !== "string" || !text.includes("<A2UI")) return text;
+  return text.replace(A2UI_TAG_REGEX, "").trim();
 }
-function extractInlineSurfaceIdsFromMessage(message3) {
-  const surfaceIds = /* @__PURE__ */ new Set();
-  const items = Array.isArray(message3?.content) ? message3.content : [];
-  for (const item of items) {
-    if (item?.type !== "text") continue;
-    const text = item.messageContent || item.text || "";
-    if (typeof text !== "string" || !text.includes("<A2UI")) continue;
-    const tags = parseA2uiTagsFromText(text);
-    for (const tag of tags) {
-      for (const cmd of tag.commands) {
-        const sid = String(cmd?.createSurface?.surfaceId || "").trim();
-        if (sid) surfaceIds.add(sid);
-      }
-    }
+function extractItemTextForA2ui(item) {
+  if (!item || item.type !== "toolCall") return "";
+  const result = item.result;
+  if (typeof result === "string") return result;
+  if (result && typeof result === "object" && typeof result.stdout === "string") {
+    return result.stdout;
   }
-  return surfaceIds;
+  return "";
 }
 function extractDismissedSurfaceIdsFromMessages(messages) {
   const lastCreateIndexBySurface = /* @__PURE__ */ new Map();
@@ -3449,15 +3406,13 @@ function extractDismissedSurfaceIdsFromMessages(messages) {
           const surfaceId = String(item.command?.createSurface?.surfaceId || "").trim();
           if (surfaceId) lastCreateIndexBySurface.set(surfaceId, messageIndex);
         }
-        if (item?.type === "text") {
-          const text = item.messageContent || item.text || "";
-          if (typeof text === "string" && text.includes("<A2UI")) {
-            const tags = parseA2uiTagsFromText(text);
-            for (const tag of tags) {
-              for (const cmd of tag.commands) {
-                const surfaceId = String(cmd?.createSurface?.surfaceId || "").trim();
-                if (surfaceId) lastCreateIndexBySurface.set(surfaceId, messageIndex);
-              }
+        const text = extractItemTextForA2ui(item);
+        if (typeof text === "string" && text.includes("<A2UI")) {
+          const tags = parseA2uiTagsFromText(text);
+          for (const tag of tags) {
+            for (const cmd of tag.commands) {
+              const surfaceId = String(cmd?.createSurface?.surfaceId || "").trim();
+              if (surfaceId) lastCreateIndexBySurface.set(surfaceId, messageIndex);
             }
           }
         }
@@ -3984,28 +3939,6 @@ function sanitizeA2uiCommands(commands) {
     return rest;
   });
 }
-function diffConversationMessages(messages, prevCursors) {
-  if (messages.length < prevCursors.length) {
-    return { shouldReplayAll: true, nextCursors: [], pendingItems: [] };
-  }
-  const nextCursors = [];
-  const pendingItems = [];
-  for (let messageIndex = 0; messageIndex < messages.length; messageIndex += 1) {
-    const message3 = messages[messageIndex];
-    const messageId = String(message3?.messageId ?? messageIndex);
-    const items = Array.isArray(message3?.content) ? message3.content : [];
-    const prevCursor = prevCursors[messageIndex];
-    const startIndex = prevCursor ? prevCursor.contentLength : 0;
-    if (prevCursor && (prevCursor.messageId !== messageId || items.length < prevCursor.contentLength)) {
-      return { shouldReplayAll: true, nextCursors: [], pendingItems: [] };
-    }
-    for (let itemIndex = startIndex; itemIndex < items.length; itemIndex += 1) {
-      pendingItems.push({ messageIndex, messageId, item: items[itemIndex] });
-    }
-    nextCursors.push({ messageId, contentLength: items.length });
-  }
-  return { shouldReplayAll: false, nextCursors, pendingItems };
-}
 function initializeWizardSurface(state, surfaceId, effects, nextWizardSteps) {
   const wizard = state.wizardSchemaBySurface[surfaceId];
   const createCommandIndex = state.latestCreateCommandIndexBySurface[surfaceId];
@@ -4025,6 +3958,10 @@ function initializeWizardSurface(state, surfaceId, effects, nextWizardSteps) {
 function processA2uiCommand(cmd, messageIndex, messageId, nextState, effects, deletedSurfaceIds, nextWizardSteps) {
   nextState.serverCommands.push(cmd);
   nextState.lastA2uiHost = { id: messageId, index: messageIndex };
+  const wizardSchema = normalizeWizardSchema(cmd);
+  if (wizardSchema) {
+    nextState.wizardSchemaBySurface[wizardSchema.surfaceId] = wizardSchema;
+  }
   const surfaceId = extractSurfaceId2(cmd);
   if (!surfaceId) return;
   if (cmd?.createSurface) {
@@ -4035,6 +3972,11 @@ function processA2uiCommand(cmd, messageIndex, messageId, nextState, effects, de
   if (cmd?.createSurface) {
     nextState.latestCreateCommandIndexBySurface[surfaceId] = nextState.serverCommands.length - 1;
     nextState.optimisticallyDismissedSurfaceIds = nextState.optimisticallyDismissedSurfaceIds.filter((id) => id !== surfaceId);
+    const schemaSource = cmd.createSurface.schema ?? cmd.createSurface.wizard ?? cmd.createSurface.plan;
+    const schema = normalizeWizardSchema(schemaSource) ?? normalizeWizardSchema(cmd.createSurface);
+    if (schema) {
+      nextState.wizardSchemaBySurface[surfaceId] = schema;
+    }
     initializeWizardSurface(nextState, surfaceId, effects, nextWizardSteps);
   }
   if (cmd?.updateDataModel) {
@@ -4051,6 +3993,28 @@ function processA2uiCommand(cmd, messageIndex, messageId, nextState, effects, de
     delete nextState.modelPathBySurface[surfaceId];
   }
 }
+function diffConversationMessages(messages, prevCursors) {
+  if (messages.length < prevCursors.length) {
+    return { shouldReplayAll: true, nextCursors: [], pendingItems: [] };
+  }
+  const nextCursors = [];
+  const pendingItems = [];
+  for (let messageIndex = 0; messageIndex < messages.length; messageIndex += 1) {
+    const message3 = messages[messageIndex];
+    const messageId = String(message3?.messageId ?? messageIndex);
+    const items = Array.isArray(message3?.content) ? message3.content : [];
+    const prevCursor = prevCursors[messageIndex];
+    const startIndex = prevCursor ? prevCursor.contentLength : 0;
+    if (prevCursor && (prevCursor.messageId !== messageId || items.length < prevCursor.contentLength)) {
+      return { shouldReplayAll: true, nextCursors: [], pendingItems: [] };
+    }
+    for (let itemIndex = startIndex; itemIndex < items.length; itemIndex += 1) {
+      pendingItems.push({ messageIndex, messageId, item: items[itemIndex] });
+    }
+    nextCursors.push({ messageId, contentLength: items.length });
+  }
+  return { shouldReplayAll: false, nextCursors, pendingItems };
+}
 function scanA2uiTagsFromMessages(messages, processedTagIds) {
   const newTags = [];
   const newTagIds = [];
@@ -4059,8 +4023,7 @@ function scanA2uiTagsFromMessages(messages, processedTagIds) {
     const messageId = String(message3?.messageId ?? messageIndex);
     const items = Array.isArray(message3?.content) ? message3.content : [];
     for (const item of items) {
-      if (item?.type !== "text") continue;
-      const text = item.messageContent || item.text || "";
+      const text = extractItemTextForA2ui(item);
       if (typeof text !== "string" || !text.includes("<A2UI")) continue;
       const tags = parseA2uiTagsFromText(text);
       for (const tag of tags) {
@@ -4075,14 +4038,9 @@ function scanA2uiTagsFromMessages(messages, processedTagIds) {
 }
 function reduceA2uiRuntimeMessages(state, messages) {
   const { shouldReplayAll, pendingItems, nextCursors } = diffConversationMessages(messages || [], state.processedMessageCursors);
-  const itemsToProcess = shouldReplayAll ? messages.flatMap((message3, messageIndex) => {
-    const messageId = String(message3?.messageId ?? messageIndex);
-    const items = Array.isArray(message3?.content) ? message3.content : [];
-    return items.map((item) => ({ messageIndex, messageId, item }));
-  }) : pendingItems;
   const tagProcessedSet = new Set(shouldReplayAll ? [] : state.processedTagIds);
   const { newTags, newTagIds } = scanA2uiTagsFromMessages(messages || [], tagProcessedSet);
-  if (!shouldReplayAll && itemsToProcess.length === 0 && newTags.length === 0) {
+  if (!shouldReplayAll && pendingItems.length === 0 && newTags.length === 0) {
     return { state, effects: [] };
   }
   const nextState = shouldReplayAll ? createA2uiRuntimeState() : { ...state };
@@ -4101,7 +4059,7 @@ function reduceA2uiRuntimeMessages(state, messages) {
   const effects = shouldReplayAll ? [{ type: "reset-model-store" }] : [];
   const deletedSurfaceIds = /* @__PURE__ */ new Set();
   const nextWizardSteps = {};
-  itemsToProcess.forEach(({ item, messageIndex, messageId }) => {
+  pendingItems.forEach(({ item, messageIndex, messageId }) => {
     if (item?.type === "a2uiSchema") {
       const schema = normalizeWizardSchema(item.schema);
       if (schema) {
@@ -4270,11 +4228,9 @@ var A2uiRuntimeContext = React10__default.createContext({
 function useA2uiRuntimeView() {
   return React10__default.useContext(A2uiRuntimeContext);
 }
-function A2uiMessageCards({ messageIndex, message: message3 }) {
+function A2uiMessageCards({ messageIndex }) {
   const { surfaceIdsByMessageIndex } = useA2uiRuntimeView();
-  const allSurfaceIds = surfaceIdsByMessageIndex[messageIndex] || [];
-  const inlineSurfaceIds = message3 ? extractInlineSurfaceIdsFromMessage(message3) : /* @__PURE__ */ new Set();
-  const surfaceIds = allSurfaceIds.filter((id) => !inlineSurfaceIds.has(id));
+  const surfaceIds = surfaceIdsByMessageIndex[messageIndex] || [];
   if (!surfaceIds.length) return null;
   return /* @__PURE__ */ jsx("div", { children: surfaceIds.map((surfaceId) => /* @__PURE__ */ jsx(XCard.Card, { id: surfaceId }, surfaceId)) });
 }
@@ -4480,16 +4436,14 @@ function buildLatestCommandIndexBySurface(messages) {
         if (surfaceId) indexBySurface[surfaceId] = commandIndex;
         continue;
       }
-      if (item?.type === "text") {
-        const text = item.messageContent || item.text || "";
-        if (typeof text !== "string" || !text.includes("<A2UI")) continue;
-        const tags = parseA2uiTagsFromText(text);
-        for (const tag of tags) {
-          for (const cmd of tag.commands) {
-            commandIndex += 1;
-            const surfaceId = extractSurfaceId3(cmd);
-            if (surfaceId) indexBySurface[surfaceId] = commandIndex;
-          }
+      const text = extractItemTextForA2ui(item);
+      if (typeof text !== "string" || !text.includes("<A2UI")) continue;
+      const tags = parseA2uiTagsFromText(text);
+      for (const tag of tags) {
+        for (const cmd of tag.commands) {
+          commandIndex += 1;
+          const surfaceId = extractSurfaceId3(cmd);
+          if (surfaceId) indexBySurface[surfaceId] = commandIndex;
         }
       }
     }
@@ -4658,39 +4612,20 @@ var TextNode2 = React10__default.memo(
     item,
     role,
     customComponents,
-    message: message3,
-    messageIndex = -1
+    message: message3
   }) => {
-    const { surfaceIdsByMessageIndex } = useA2uiRuntimeView();
-    const rawContent = toA2uiDisplayText(role, item?.messageContent);
-    const segments = splitA2uiTextSegments(rawContent);
+    const content = toA2uiDisplayText(role, item?.messageContent);
     const markdownComponents = {
       [RESOURCE_MARKDOWN_TAG]: MessageResourceTag,
       ...customComponents
     };
-    const visibleSurfaceIds = messageIndex >= 0 ? new Set(surfaceIdsByMessageIndex[messageIndex] || []) : null;
-    const firstSeg = segments[0];
-    const isPureText = segments.length === 0 || segments.length === 1 && firstSeg.type === "text";
-    if (isPureText) {
-      const content = firstSeg && firstSeg.type === "text" ? firstSeg.content : "";
-      if (typeof content === "string" && content.startsWith("Question:")) {
-        return /* @__PURE__ */ jsx(QuestionSummary, { content });
-      }
-      const markdownContent = typeof content === "string" ? transformResourceText(content) : content;
-      return /* @__PURE__ */ jsxs(Fragment, { children: [
-        !!item.reasoningContent && /* @__PURE__ */ jsx(Think, { title: "\u6DF1\u5EA6\u601D\u8003", children: item.reasoningContent }),
-        !!markdownContent && /* @__PURE__ */ jsx(XMarkdown_default, { message: message3, components: markdownComponents, content: markdownContent })
-      ] });
+    if (typeof content === "string" && content.startsWith("Question:")) {
+      return /* @__PURE__ */ jsx(QuestionSummary, { content });
     }
+    const markdownContent = typeof content === "string" ? transformResourceText(content) : content;
     return /* @__PURE__ */ jsxs(Fragment, { children: [
       !!item.reasoningContent && /* @__PURE__ */ jsx(Think, { title: "\u6DF1\u5EA6\u601D\u8003", children: item.reasoningContent }),
-      segments.map((seg, i) => {
-        if (seg.type === "text") {
-          const markdownContent = transformResourceText(seg.content);
-          return seg.content.trim() ? /* @__PURE__ */ jsx(XMarkdown_default, { message: message3, components: markdownComponents, content: markdownContent }, `text-${i}`) : null;
-        }
-        return seg.surfaceIds.filter((sid) => !visibleSurfaceIds || visibleSurfaceIds.has(sid)).map((sid) => /* @__PURE__ */ jsx(XCard.Card, { id: sid }, `a2ui-${i}-${sid}`));
-      })
+      !!markdownContent && /* @__PURE__ */ jsx(XMarkdown_default, { message: message3, components: markdownComponents, content: markdownContent })
     ] });
   }
 );
@@ -4788,6 +4723,15 @@ var getToolRenderConfig = (toolName) => {
     alwaysShowContent: false
   };
 };
+function stripA2uiTagsFromResult(result) {
+  if (!result || typeof result !== "object" || Array.isArray(result)) return result;
+  const cleaned = {};
+  for (const [key, value] of Object.entries(result)) {
+    cleaned[key] = typeof value === "string" && value.includes("<A2UI") ? stripA2uiTags(value) : value;
+  }
+  const hasVisible = Object.values(cleaned).some((v) => v !== "" && v !== null && v !== void 0);
+  return hasVisible ? cleaned : null;
+}
 var formatContent = (content) => {
   try {
     if (!content) return { text: "", isJson: false, parsed: null };
@@ -4798,9 +4742,11 @@ var formatContent = (content) => {
     if (typeof parsed === "object" && parsed !== null) {
       return { text: JSON.stringify(parsed, null, 2), isJson: true, parsed };
     }
-    return { text: content, isJson: false, parsed: null };
+    const stripped = content.includes("<A2UI") ? stripA2uiTags(content) : content;
+    return { text: stripped, isJson: false, parsed: null };
   } catch {
-    return { text: typeof content === "string" ? content : "", isJson: false, parsed: null };
+    const text = typeof content === "string" ? content.includes("<A2UI") ? stripA2uiTags(content) : content : "";
+    return { text, isJson: false, parsed: null };
   }
 };
 var ToolCallItem = ({ item }) => {
@@ -4814,7 +4760,12 @@ var ToolCallItem = ({ item }) => {
     return "running";
   }, [item.status, item.errorMessage, item.result]);
   const argsContent = useMemo(() => formatContent(item.arguments || item.content), [item.arguments, item.content]);
-  const resultContent = useMemo(() => item.result ? formatContent(item.result) : null, [item.result]);
+  const resultContent = useMemo(() => {
+    if (!item.result) return null;
+    const cleanedResult = stripA2uiTagsFromResult(item.result);
+    if (!cleanedResult) return null;
+    return formatContent(cleanedResult);
+  }, [item.result]);
   const hasContent = useMemo(() => {
     if (renderConfig.disableExpandOnError && status === "error") return false;
     let alwaysShow = false;
@@ -4905,7 +4856,7 @@ var ToolCallItem = ({ item }) => {
   );
 };
 var tool_call_item_default = ToolCallItem;
-var RENDERABLE_MESSAGE_TYPES = ["runStarted", "toolCall", "toolResult", "text", "stepError", "files", "plan"];
+var RENDERABLE_MESSAGE_TYPES = ["runStarted", "toolCall", "toolResult", "text", "stepError", "runFailed", "files", "plan"];
 var MessageRender_default = React10__default.memo(({ role, message: message3, messageIndex = -1, loading, containerRef, customComponents }) => {
   const content = useMemo(() => {
     return (message3.content || []).filter((item) => {
@@ -4920,9 +4871,7 @@ var MessageRender_default = React10__default.memo(({ role, message: message3, me
       }
       if (item.type === "text") {
         const rawText = item.messageContent || item.text || "";
-        const visibleText = stripA2uiTags(rawText);
-        const hasA2uiTag2 = typeof rawText === "string" && rawText.includes("<A2UI");
-        return !!visibleText.trim() || !!item.reasoningContent || hasA2uiTag2;
+        return !!rawText.trim() || !!item.reasoningContent;
       }
       return true;
     });
@@ -4941,9 +4890,16 @@ var MessageRender_default = React10__default.memo(({ role, message: message3, me
     return isEmptyObj(quoteMsg2) ? null : quoteMsg2;
   }, [message3.params, message3.quoteMsg]);
   if (content.length === 0) return null;
+  const lastToolCallIndex = (() => {
+    let lastIdx = -1;
+    content.forEach((item, i) => {
+      if (item.type === "toolCall" || item.type === "toolResult") lastIdx = i;
+    });
+    return lastIdx;
+  })();
   return /* @__PURE__ */ jsxs(Flex, { ref: containerRef, vertical: true, gap: 8, children: [
-    content.map((item, index) => {
-      return /* @__PURE__ */ jsx(
+    content.map((item, index) => /* @__PURE__ */ jsxs(React10__default.Fragment, { children: [
+      /* @__PURE__ */ jsx(
         Bubble,
         {
           role: role.user,
@@ -4952,17 +4908,26 @@ var MessageRender_default = React10__default.memo(({ role, message: message3, me
           content: /* @__PURE__ */ jsxs(Fragment, { children: [
             item.type === "runStarted" && /* @__PURE__ */ jsx(RunStartedNode, { loading }, `flow-start-${index}`),
             (item.type === "toolCall" || item.type === "toolResult") && /* @__PURE__ */ jsx(tool_call_item_default, { item }, `tool-call-${item.toolCallId || index}`),
-            item.type === "text" && /* @__PURE__ */ jsx(TextNode2, { item, role: message3.role, customComponents, message: message3, messageIndex }, `message-${index}`),
-            item.type === "stepError" && (item.errorMessage ? /* @__PURE__ */ jsx(XMarkdown_default, { message: message3, components: customComponents, content: item.errorMessage }) : null),
+            item.type === "text" && /* @__PURE__ */ jsx(
+              TextNode2,
+              {
+                item,
+                role: message3.role,
+                customComponents,
+                message: message3,
+                messageIndex
+              },
+              `message-${index}`
+            ),
+            (item.type === "stepError" || item.type === "runFailed") && (item.errorMessage ? /* @__PURE__ */ jsx(XMarkdown_default, { message: message3, components: customComponents, content: item.errorMessage }) : null),
             item.type === "files" && /* @__PURE__ */ jsx(FilesNode, { item }, `files-${index}`),
             item.type === "plan" && /* @__PURE__ */ jsx(A2uiPlanNode, { item }, `plan-${index}`)
           ] })
-        },
-        `message-${index}`
-      );
-    }),
-    quoteMsg && /* @__PURE__ */ jsx(QuoteMsgNode, { quoteMsg, role }),
-    messageIndex >= 0 ? /* @__PURE__ */ jsx(A2uiMessageCards, { messageIndex, message: message3 }) : null
+        }
+      ),
+      index === lastToolCallIndex && messageIndex >= 0 ? /* @__PURE__ */ jsx(A2uiMessageCards, { messageIndex, message: message3 }) : null
+    ] }, `message-${index}`)),
+    quoteMsg && /* @__PURE__ */ jsx(QuoteMsgNode, { quoteMsg, role })
   ] });
 });
 var WelcomeItem_default = ({ icon = true, title = true, description = true, prompts = true }) => {