@zero-library/chat-copilot 3.1.9 → 3.1.11

package/dist/index.cjs.js

@@ -1356,7 +1356,7 @@ function createChatStore() {
   };
   const setConversationSpec = (spec) => {
     if (common.isObject(spec)) {
-      Object.assign(conversation.active.spec, spec);
+      Object.assign(conversation.active.spec || {}, spec);
     }
   };
   const setConversationUserInput = (userInput) => {
@@ -1401,9 +1401,14 @@ function createChatStore() {
       });
       conversation.messages[conversationId].message = [];
       if (data?.length) {
-        data.forEach((msg) => {
+        const mainMessages = data.filter((msg) => !msg.toolCallId);
+        const subAgentMessages = data.filter((msg) => msg.toolCallId);
+        mainMessages.forEach((msg) => {
           processMessageContent(msg);
         });
+        subAgentMessages.forEach((msg) => {
+          routeSubAgentMessage(msg);
+        });
         finalizeHistoryMessages(conversationId);
         normalizeMessagesByExecutionAndRole(conversation.messages[conversationId].message);
       }
@@ -1469,9 +1474,7 @@ function createChatStore() {
       item.generating = false;
     });
   }
-  function startCallback(msg) {
-    const messages = conversation.messages[msg.conversationId]?.message;
-    if (!messages) return;
+  function startCallback(msg, messages, isMain) {
     const idx = findExecutionMsgIndex(msg, messages);
     const contentItem = msg.content[0];
     if (contentItem.type !== "runStarted") return;
@@ -1482,23 +1485,24 @@ function createChatStore() {
         generating: true
       };
       messages.push(finalMsg);
-      const targetConversation = conversations.list.items.find((item) => item.id === msg.conversationId);
-      if (targetConversation && msg.createdAt) {
-        updateConversations({
-          ...targetConversation,
-          id: targetConversation.id,
-          title: targetConversation.label,
-          updatedAt: msg.createdAt
-        });
+      if (isMain) {
+        const targetConversation = conversations.list.items.find((item) => item.id === msg.conversationId);
+        if (targetConversation && msg.createdAt) {
+          updateConversations({
+            ...targetConversation,
+            id: targetConversation.id,
+            title: targetConversation.label,
+            updatedAt: msg.createdAt
+          });
+        }
       }
     } else {
       const prevContent = messages[idx]?.content || [];
       messages[idx].content = [...prevContent, contentItem];
     }
-    conversation.messages[msg.conversationId].loading = true;
+    if (isMain) conversation.messages[msg.conversationId].loading = true;
   }
-  function textCallback(msg) {
-    const messages = conversation.messages[msg.conversationId]?.message;
+  function textCallback(msg, messages, isMain) {
     const idx = findExecutionMsgIndex(msg, messages);
     const contents = idx !== -1 && messages[idx] ? messages[idx].content || [] : [];
     const nextContent = msg.content[0];
@@ -1527,13 +1531,12 @@ function createChatStore() {
         messages[idx].content = [...contents, normalizedNextContent];
       }
     }
-    conversation.messages[msg.conversationId].loading = true;
+    if (isMain) conversation.messages[msg.conversationId].loading = true;
   }
-  function stepStartedCallback(msg) {
-    const messages = conversation.messages[msg.conversationId]?.message;
+  function stepStartedCallback(msg, messages, isMain) {
     const idx = findExecutionMsgIndex(msg, messages);
     const contentItem = msg.content[0];
-    conversation.messages[msg.conversationId].loading = true;
+    if (isMain) conversation.messages[msg.conversationId].loading = true;
     if (idx !== -1 && messages[idx]) {
       const contentList = messages[idx].content || [];
       const runStartedIndex = contentList.findIndex((item) => item.type === "runStarted");
@@ -1543,52 +1546,60 @@ function createChatStore() {
         messages[idx].content = contentList.map((item, i) => i === runStartedIndex ? nextRunStartedItem : item);
       }
     }
+    if (isMain) config.hooks?.onStepMessage?.(msg);
     config.hooks?.onStepMessage?.(msg);
   }
-  function stepFinishedCallback(msg) {
-    conversation.messages[msg.conversationId].loading = true;
-    config.hooks?.onStepMessage?.(msg);
+  function stepFinishedCallback(msg, _messages, isMain) {
+    if (isMain) conversation.messages[msg.conversationId].loading = true;
+    if (isMain) config.hooks?.onStepMessage?.(msg);
   }
-  function stepErrCallback(msg) {
-    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 (idx !== -1) {
-        messages[idx].generating = false;
-      }
-      if (idx !== -1) {
-        const prevContent = messages[idx]?.content || [];
-        messages[idx].content = [...prevContent, contentItem];
-      } else {
-        const finalMsg = { ...msg };
-        finalMsg.generating = false;
-        messages.push(finalMsg);
+  function stepErrCallback(msg, messages, isMain) {
+    if (isMain) conversation.messages[msg.conversationId].loading = false;
+    const idx = findExecutionMsgIndex(msg, messages);
+    const contentItem = msg.content[0];
+    messages.forEach((item) => {
+      if (item.executionId === msg.executionId) {
+        item.generating = false;
       }
+    });
+    if (idx !== -1) {
+      messages[idx].generating = false;
+      const prevContent = messages[idx]?.content || [];
+      messages[idx].content = [...prevContent, contentItem];
+    } else {
+      const finalMsg = { ...msg };
+      finalMsg.generating = false;
+      messages.push(finalMsg);
     }
-    config.hooks?.onStepMessage?.(msg);
+    if (isMain) config.hooks?.onStepMessage?.(msg);
   }
-  function doneCallback(msg) {
+  function doneCallback(msg, message3, isMain) {
     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);
+    if (isMain) config.hooks?.onAfterAcceptMessage?.(msg);
   }
-  function titleCallback(msg) {
+  function titleCallback(msg, _messages, isMain) {
     const content = msg.content[0];
     if (content.type !== "conversationNewTitle") return;
+    if (!isMain) return;
     const title = content.title || "";
     const conversationId = msg.conversationId || "";
     if (content && conversations.list.items.length) {
@@ -1597,9 +1608,7 @@ function createChatStore() {
       conversations.list.items[idx].label = title;
     }
   }
-  function toolCallCallback(msg) {
-    const messages = conversation.messages[msg.conversationId]?.message;
-    if (!messages) return;
+  function toolCallCallback(msg, messages, isMain) {
     let idx = -1;
     const contentItem = msg.content[0];
     if (contentItem.type !== "toolCall") return;
@@ -1635,16 +1644,20 @@ function createChatStore() {
         if (contentItem.status) {
           nextItem.status = contentItem.status;
         }
+        if (contentItem.toolIcon) {
+          nextItem.toolIcon = contentItem.toolIcon;
+        }
+        if (contentItem.display) {
+          nextItem.display = (existingItem.display || "") + contentItem.display;
+        }
         messages[idx].content = contents.map((item, i) => i === existingItemIndex ? nextItem : item);
       } else {
         messages[idx].content = [...contents, contentItem];
       }
     }
-    conversation.messages[msg.conversationId].loading = true;
+    if (isMain) conversation.messages[msg.conversationId].loading = true;
   }
-  function toolResultCallback(msg) {
-    const messages = conversation.messages[msg.conversationId]?.message;
-    if (!messages) return;
+  function toolResultCallback(msg, messages, isMain) {
     const contentItem = msg.content[0];
     if (contentItem.type !== "toolResult") return;
     let idx = -1;
@@ -1675,15 +1688,16 @@ function createChatStore() {
       if (contentItem.title) {
         nextToolCallItem.title = contentItem.title;
       }
+      if (contentItem.display !== void 0) {
+        nextToolCallItem.display = contentItem.display;
+      }
       messages[idx].content = contents.map((item, i) => i === toolCallIndex ? nextToolCallItem : item);
     } else {
       messages[idx].content = [...contents, contentItem];
     }
-    conversation.messages[msg.conversationId].loading = true;
+    if (isMain) conversation.messages[msg.conversationId].loading = true;
   }
-  function a2uiCommandCallback(msg) {
-    const messages = conversation.messages[msg.conversationId]?.message;
-    if (!messages) return;
+  function a2uiCommandCallback(msg, messages, isMain) {
     const idx = findExecutionMsgIndex(msg, messages);
     const contentItem = msg.content[0];
     if (contentItem.type !== "a2uiCommand") return;
@@ -1694,45 +1708,147 @@ function createChatStore() {
       const prevContent = messages[idx]?.content || [];
       messages[idx].content = [...prevContent, contentItem];
     }
-    conversation.messages[msg.conversationId].loading = true;
+    if (isMain) conversation.messages[msg.conversationId].loading = true;
+  }
+  function toolCallDeltaCallback(msg, messages, isMain) {
+    const contentItem = msg.content[0];
+    if (contentItem.type !== "toolCallDelta") return;
+    let idx = -1;
+    if (contentItem.toolCallId) {
+      idx = messages.findLastIndex(
+        (m) => m.content?.some((c) => (c.type === "toolCall" || c.type === "toolCallDelta") && c.toolCallId === contentItem.toolCallId)
+      );
+    }
+    if (idx === -1) idx = findExecutionMsgIndex(msg, messages);
+    if (idx === -1) {
+      messages.push({
+        ...msg,
+        content: [
+          {
+            type: "toolCall",
+            toolCallId: contentItem.toolCallId,
+            toolName: contentItem.toolName || void 0,
+            toolIcon: contentItem.toolIcon,
+            title: contentItem.title,
+            content: contentItem.argumentsDelta || "",
+            display: contentItem.display,
+            status: contentItem.status || "running"
+          }
+        ],
+        generating: true
+      });
+    } else {
+      const contents = messages[idx].content;
+      const itemIdx = contents.findIndex(
+        (c) => (c.type === "toolCall" || c.type === "toolCallDelta") && c.toolCallId === contentItem.toolCallId
+      );
+      if (itemIdx !== -1) {
+        const existing = contents[itemIdx];
+        const nextItem = {
+          ...existing,
+          type: "toolCall",
+          content: (existing.content || "") + (contentItem.argumentsDelta || "")
+        };
+        if (contentItem.toolName) nextItem.toolName = contentItem.toolName;
+        if (contentItem.title) nextItem.title = contentItem.title;
+        if (contentItem.status) nextItem.status = contentItem.status;
+        if (contentItem.toolIcon) nextItem.toolIcon = contentItem.toolIcon;
+        if (contentItem.display) nextItem.display = (existing.display || "") + contentItem.display;
+        messages[idx].content = contents.map((c, i) => i === itemIdx ? nextItem : c);
+      } else {
+        messages[idx].content = [
+          ...contents,
+          {
+            type: "toolCall",
+            toolCallId: contentItem.toolCallId,
+            toolName: contentItem.toolName || void 0,
+            toolIcon: contentItem.toolIcon,
+            title: contentItem.title,
+            content: contentItem.argumentsDelta || "",
+            display: contentItem.display,
+            status: contentItem.status || "running"
+          }
+        ];
+      }
+    }
+    if (isMain) conversation.messages[msg.conversationId].loading = true;
+  }
+  function findToolCallItemRecursive(messages, toolCallId) {
+    for (let i = messages.length - 1; i >= 0; i--) {
+      const msg = messages[i];
+      const contents = msg.content || [];
+      const itemIdx = contents.findIndex((c) => c.type === "toolCall" && c.toolCallId === toolCallId);
+      if (itemIdx !== -1) {
+        return { messageList: msg, itemIndex: itemIdx };
+      }
+      for (const content of contents) {
+        if (content.type === "toolCall") {
+          const subMessages = content.subMessages;
+          if (subMessages?.length) {
+            const found = findToolCallItemRecursive(subMessages, toolCallId);
+            if (found) return found;
+          }
+        }
+      }
+    }
+    return null;
+  }
+  function routeSubAgentMessage(msg) {
+    const conversationId = msg.conversationId;
+    const mainMessages = conversation.messages[conversationId]?.message;
+    if (!mainMessages) return;
+    const found = findToolCallItemRecursive(mainMessages, msg.toolCallId);
+    if (!found) {
+      return;
+    }
+    const { messageList, itemIndex } = found;
+    const contents = messageList.content;
+    const toolCallItem = contents[itemIndex];
+    toolCallItem.hasSubAgent = true;
+    if (!toolCallItem.subMessages) {
+      toolCallItem.subMessages = [];
+    }
+    processMessageContent(msg, toolCallItem.subMessages);
+    messageList.content = contents.map((c, i) => i === itemIndex ? { ...toolCallItem } : c);
   }
-  function processSingleMessageContent(newMessage) {
+  function processSingleMessageContent(newMessage, messages, isMain) {
     switch (newMessage.content[0].type) {
       case "runStarted":
-        startCallback(newMessage);
+        startCallback(newMessage, messages, isMain);
         break;
       case "text":
-        textCallback(newMessage);
+        textCallback(newMessage, messages, isMain);
         break;
       case "stepStarted":
-        stepStartedCallback(newMessage);
+        stepStartedCallback(newMessage, messages, isMain);
         break;
       case "stepFinished":
-        stepFinishedCallback(newMessage);
+        stepFinishedCallback(newMessage, messages, isMain);
         break;
       case "stepError":
-        stepErrCallback(newMessage);
+        stepErrCallback(newMessage, messages, isMain);
         break;
       case "runFinished":
       case "runFailed":
       case "runStopped":
-        doneCallback(newMessage);
+        doneCallback(newMessage, messages, isMain);
         break;
       case "conversationNewTitle":
-        titleCallback(newMessage);
+        titleCallback(newMessage, messages, isMain);
         break;
       case "toolCall":
-        toolCallCallback(newMessage);
+        toolCallCallback(newMessage, messages, isMain);
+        break;
+      case "toolCallDelta":
+        toolCallDeltaCallback(newMessage, messages, isMain);
         break;
       case "toolResult":
-        toolResultCallback(newMessage);
+        toolResultCallback(newMessage, messages, isMain);
         break;
       case "a2uiCommand":
-        a2uiCommandCallback(newMessage);
+        a2uiCommandCallback(newMessage, messages, isMain);
         break;
       default: {
-        const messages = conversation.messages[newMessage.conversationId]?.message;
-        if (!messages) return;
         const idx = findExecutionMsgIndex(newMessage, messages);
         if (idx === -1) {
           const finalMsg = { ...newMessage, generating: true };
@@ -1741,20 +1857,21 @@ function createChatStore() {
           const prevContent = messages[idx]?.content || [];
           messages[idx].content = [...prevContent, ...newMessage.content];
         }
-        conversation.messages[newMessage.conversationId].loading = true;
+        if (isMain) conversation.messages[newMessage.conversationId].loading = true;
         break;
       }
     }
   }
-  function processMessageContent(message3) {
+  function processMessageContent(message3, targetMessages) {
     const newMessage = {
       ...message3,
       agentId: agent.agentInfo.id
     };
+    const isMain = !targetMessages;
+    const messages = targetMessages ?? conversation.messages[newMessage.conversationId]?.message;
+    if (!messages) return;
     const contentList = Array.isArray(newMessage.content) ? newMessage.content : [];
     if (contentList.length === 0) {
-      const messages = conversation.messages[newMessage.conversationId]?.message;
-      if (!messages) return;
       const idx = findExecutionMsgIndex(newMessage, messages);
       if (idx === -1) {
         messages.push({ ...newMessage });
@@ -1770,17 +1887,32 @@ function createChatStore() {
       return;
     }
     contentList.forEach((contentItem) => {
-      processSingleMessageContent({
-        ...newMessage,
-        content: [contentItem]
-      });
+      processSingleMessageContent(
+        {
+          ...newMessage,
+          content: [contentItem]
+        },
+        messages,
+        isMain
+      );
     });
-    normalizeMessagesByExecutionAndRole(conversation.messages[newMessage.conversationId]?.message);
+    normalizeMessagesByExecutionAndRole(messages);
   }
   function isStoppedIncomingMessage(newMessage) {
     const messages = conversation.messages[newMessage.conversationId]?.message;
     if (!messages) return false;
-    return messages.some((item) => item.stopFlag && item.executionId === newMessage.executionId);
+    if (messages.some((item) => item.stopFlag && item.executionId === newMessage.executionId)) {
+      return true;
+    }
+    return messages.some(
+      (msg) => msg.content?.some((c) => {
+        if (c.type === "toolCall") {
+          const subMessages = c.subMessages;
+          return subMessages?.some((sub) => sub.stopFlag && sub.executionId === newMessage.executionId);
+        }
+        return false;
+      })
+    );
   }
   const acceptMessage = async (newMessage) => {
     const conversationId = newMessage.conversationId;
@@ -1790,6 +1922,10 @@ function createChatStore() {
     if (canProceed === false) {
       throw new Error("\u64CD\u4F5C\u88AB\u963B\u6B62");
     }
+    if (newMessage.toolCallId) {
+      routeSubAgentMessage(newMessage);
+      return;
+    }
     if (isStoppedIncomingMessage(newMessage)) {
       conversation.messages[conversationId].loading = false;
       return;
@@ -1871,19 +2007,25 @@ function createChatStore() {
       const lastMsg = messages[messages.length - 1];
       if (lastMsg.executionId) {
         await config.services.request.cancelMessage(lastMsg.executionId);
-        messages.forEach((item) => {
-          if (item.executionId === lastMsg.executionId) {
-            item.generating = false;
-            item.stopFlag = true;
+        const markStopped = (msgList, matchExecutionId) => {
+          msgList.forEach((item) => {
+            if (item.executionId === lastMsg.executionId) {
+              item.generating = false;
+              item.stopFlag = true;
+            }
             if (item.content && Array.isArray(item.content)) {
               item.content.forEach((contentItem) => {
                 if (contentItem.type === "toolCall" && contentItem.status !== "success" && contentItem.status !== "error") {
                   contentItem.status = "error";
                 }
+                if (contentItem.subMessages?.length) {
+                  markStopped(contentItem.subMessages);
+                }
               });
             }
-          }
-        });
+          });
+        };
+        markStopped(messages);
       } else {
         lastMsg.stopFlag = true;
         lastMsg.generating = false;
@@ -2620,6 +2762,7 @@ var AgentNavigate_default = React10.memo(({ data }) => {
   }, [data]);
   const handleClick = () => {
     if (!content?.emit) return;
+    common.emit(content.emit, { ...content.data, name: "luya-web-drawer" }, "nearest");
   };
   return /* @__PURE__ */ jsxRuntime.jsx(antd.Button, { onClick: handleClick, style: { padding: 0 }, type: "link", children: content?.name || "\u70B9\u51FB\u6B64\u5904" });
 });
@@ -2830,9 +2973,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";
@@ -2843,24 +2984,12 @@ var PreviewLink_default = ({ data, loading, message: message3, ...rest }) => {
       return lastSegment;
     }
   };
-  const getPreviewFileUrl = (href) => {
-    return common.buildUrlParams({ [TOKEN_KEY]: tokenManager.get() || "" }, href);
-  };
-  const handlePreviewLink = (href) => {
-    const fileName = getLinkFileName(href);
-    const suffix = common.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 = common.getFileSuffixName(fileName);
     chatStore.setPreview({
       fileUrl: chatStore.config.services.request.getPreviewUrl({
-        path: href,
+        path,
         workspaceId: message3.conversationId
       }),
       fileName,
@@ -2874,12 +3003,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");
@@ -3388,11 +3523,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;
@@ -3410,61 +3542,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();
@@ -3478,15 +3566,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);
             }
           }
         }
@@ -4013,28 +4099,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];
@@ -4054,6 +4118,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) {
@@ -4064,6 +4132,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) {
@@ -4080,6 +4153,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 = [];
@@ -4088,8 +4183,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) {
@@ -4104,14 +4198,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 };
@@ -4130,7 +4219,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) {
@@ -4299,11 +4388,9 @@ var A2uiRuntimeContext = React10__namespace.default.createContext({
 function useA2uiRuntimeView() {
   return React10__namespace.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__ */ jsxRuntime.jsx("div", { children: surfaceIds.map((surfaceId) => /* @__PURE__ */ jsxRuntime.jsx(XCard.Card, { id: surfaceId }, surfaceId)) });
 }
@@ -4509,16 +4596,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;
         }
       }
     }
@@ -4622,7 +4707,8 @@ var FilesNode = React10__namespace.default.memo(({ item }) => {
 
 // src/components/CustomComponents/MessageNode/style.module.less
 var style_module_default2 = {
-  runStartedNode: "style_module_runStartedNode"};
+  runStartedNode: "style_module_runStartedNode",
+  dot: "style_module_dot"};
 var QuoteMsgNode = React10__namespace.default.memo(({ quoteMsg, role }) => {
   if (!quoteMsg || !quoteMsg.messageContent) return null;
   return /* @__PURE__ */ jsxRuntime.jsx(
@@ -4653,9 +4739,12 @@ var QuoteMsgNode = React10__namespace.default.memo(({ quoteMsg, role }) => {
     }
   );
 });
-var RunStartedNode = React10__namespace.default.memo(({ loading }) => {
-  if (!loading) return null;
-  return /* @__PURE__ */ jsxRuntime.jsx(antd.Flex, { gap: 8, align: "center", className: style_module_default2.runStartedNode, children: /* @__PURE__ */ jsxRuntime.jsx(icons.LoadingOutlined, { style: { color: "#1677ff" } }) });
+var RunStartedNode = React10__namespace.default.memo(() => {
+  return /* @__PURE__ */ jsxRuntime.jsxs("span", { className: style_module_default2.runStartedNode, children: [
+    /* @__PURE__ */ jsxRuntime.jsx("span", { className: style_module_default2.dot }),
+    /* @__PURE__ */ jsxRuntime.jsx("span", { className: style_module_default2.dot }),
+    /* @__PURE__ */ jsxRuntime.jsx("span", { className: style_module_default2.dot })
+  ] });
 });
 var RESOURCE_MARKDOWN_TAG = "resourcetag";
 var RESOURCE_TOKEN_REGEX = /(\w+):\/\/([^?\s]+)\?name=([^&\s]+)&label=([^\s]+)/g;
@@ -4687,39 +4776,20 @@ var TextNode2 = React10__namespace.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__ */ jsxRuntime.jsx(QuestionSummary, { content });
-      }
-      const markdownContent = typeof content === "string" ? transformResourceText(content) : content;
-      return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-        !!item.reasoningContent && /* @__PURE__ */ jsxRuntime.jsx(xV2.Think, { title: "\u6DF1\u5EA6\u601D\u8003", children: item.reasoningContent }),
-        !!markdownContent && /* @__PURE__ */ jsxRuntime.jsx(XMarkdown_default, { message: message3, components: markdownComponents, content: markdownContent })
-      ] });
+    if (typeof content === "string" && content.startsWith("Question:")) {
+      return /* @__PURE__ */ jsxRuntime.jsx(QuestionSummary, { content });
     }
+    const markdownContent = typeof content === "string" ? transformResourceText(content) : content;
     return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
       !!item.reasoningContent && /* @__PURE__ */ jsxRuntime.jsx(xV2.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__ */ jsxRuntime.jsx(XMarkdown_default, { message: message3, components: markdownComponents, content: markdownContent }, `text-${i}`) : null;
-        }
-        return seg.surfaceIds.filter((sid) => !visibleSurfaceIds || visibleSurfaceIds.has(sid)).map((sid) => /* @__PURE__ */ jsxRuntime.jsx(XCard.Card, { id: sid }, `a2ui-${i}-${sid}`));
-      })
+      !!markdownContent && /* @__PURE__ */ jsxRuntime.jsx(XMarkdown_default, { message: message3, components: markdownComponents, content: markdownContent })
     ] });
   }
 );
@@ -4728,11 +4798,17 @@ var TextNode2 = React10__namespace.default.memo(
 var index_module_default2 = {
   iconContainer: "index_module_iconContainer",
   toolName: "index_module_toolName",
+  toolNamePending: "index_module_toolNamePending",
+  dot: "index_module_dot",
   duration: "index_module_duration",
   statusIcon: "index_module_statusIcon",
+  expandIcon: "index_module_expandIcon",
+  expanded: "index_module_expanded",
   sectionLabel: "index_module_sectionLabel",
+  plainTextContainer: "index_module_plainTextContainer",
   markdownContainer: "index_module_markdownContainer",
   sectionBlock: "index_module_sectionBlock",
+  contentScrollContainer: "index_module_contentScrollContainer",
   todoList: "index_module_todoList",
   todoItem: "index_module_todoItem",
   statusIconWrapper: "index_module_statusIconWrapper",
@@ -4742,6 +4818,9 @@ var index_module_default2 = {
   emptyText: "index_module_emptyText"
 };
 var DefaultToolRender = ({ argsContent, resultContent, errorMessage, item }) => {
+  if (item.display) {
+    return /* @__PURE__ */ jsxRuntime.jsx("pre", { className: index_module_default2.plainTextContainer, children: item.display });
+  }
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     (item.content || item.arguments) && argsContent && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: index_module_default2.sectionBlock, children: [
       /* @__PURE__ */ jsxRuntime.jsx(antd.Typography.Text, { className: index_module_default2.sectionLabel, children: "\u8F93\u5165\u53C2\u6570" }),
@@ -4817,6 +4896,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 };
@@ -4827,14 +4915,16 @@ 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 }) => {
   const { token } = antd.theme.useToken();
-  const renderConfig = getToolRenderConfig(item.toolName);
+  const renderConfig = getToolRenderConfig(item);
   const CustomRender = renderConfig.component;
   const status = React10.useMemo(() => {
     if (item.status) return item.status;
@@ -4843,7 +4933,12 @@ var ToolCallItem = ({ item }) => {
     return "running";
   }, [item.status, item.errorMessage, item.result]);
   const argsContent = React10.useMemo(() => formatContent(item.arguments || item.content), [item.arguments, item.content]);
-  const resultContent = React10.useMemo(() => item.result ? formatContent(item.result) : null, [item.result]);
+  const resultContent = React10.useMemo(() => {
+    if (!item.result) return null;
+    const cleanedResult = stripA2uiTagsFromResult(item.result);
+    if (!cleanedResult) return null;
+    return formatContent(cleanedResult);
+  }, [item.result]);
   const hasContent = React10.useMemo(() => {
     if (renderConfig.disableExpandOnError && status === "error") return false;
     let alwaysShow = false;
@@ -4853,35 +4948,30 @@ var ToolCallItem = ({ item }) => {
       alwaysShow = renderConfig.alwaysShowContent;
     }
     if (alwaysShow) return true;
-    return Boolean(item.errorMessage);
-  }, [renderConfig.disableExpandOnError, renderConfig.alwaysShowContent, item.errorMessage, status, argsContent.parsed, resultContent?.parsed]);
+    if (item.display) return true;
+    if (item.errorMessage) return true;
+    if (argsContent.text) return true;
+    if (resultContent?.text) return true;
+    return false;
+  }, [
+    renderConfig.disableExpandOnError,
+    renderConfig.alwaysShowContent,
+    item.display,
+    item.errorMessage,
+    status,
+    argsContent.parsed,
+    resultContent?.parsed,
+    argsContent.text,
+    resultContent?.text
+  ]);
   const isDefaultExpanded = React10.useMemo(() => {
     if (typeof renderConfig.defaultExpanded === "function") {
       return renderConfig.defaultExpanded(argsContent.parsed, resultContent?.parsed);
     }
     return renderConfig.defaultExpanded;
   }, [renderConfig.defaultExpanded, argsContent.parsed, resultContent?.parsed]);
-  const statusConfig = {
-    running: {
-      icon: /* @__PURE__ */ jsxRuntime.jsx(icons.LoadingOutlined, {}),
-      color: token.colorPrimary
-    },
-    success: {
-      icon: null,
-      color: token.colorSuccess
-    },
-    error: {
-      icon: null,
-      color: token.colorSuccess
-    },
-    pending: {
-      icon: /* @__PURE__ */ jsxRuntime.jsx(icons.LoadingOutlined, {}),
-      color: token.colorTextSecondary
-    }
-  }[status] || {
-    icon: /* @__PURE__ */ jsxRuntime.jsx(icons.LoadingOutlined, {}),
-    color: token.colorPrimary
-  };
+  const showLoading = status === "running" || status === "pending";
+  const displayName = item.title || (showLoading ? "" : item.toolName || "Unknown Tool");
   const renderIcon = () => {
     if (!item.toolIcon) {
       return /* @__PURE__ */ jsxRuntime.jsx(icons.ToolOutlined, { style: { fontSize: 14, color: token.colorTextSecondary } });
@@ -4899,9 +4989,11 @@ var ToolCallItem = ({ item }) => {
       collapsible: hasContent ? void 0 : "disabled",
       defaultActiveKey: isDefaultExpanded && hasContent ? [item.toolCallId || "fallback-key"] : void 0,
       expandIconPlacement: "end",
+      expandIcon: ({ isActive }) => hasContent ? /* @__PURE__ */ jsxRuntime.jsx(icons.RightOutlined, { className: `${index_module_default2.expandIcon} ${isActive ? index_module_default2.expanded : ""}` }) : null,
       styles: {
         header: {
-          padding: "6px 10px"
+          padding: "6px 10px",
+          overflow: "hidden"
         }
       },
       items: [
@@ -4910,14 +5002,18 @@ var ToolCallItem = ({ item }) => {
           showArrow: hasContent,
           label: /* @__PURE__ */ jsxRuntime.jsxs(antd.Flex, { align: "center", gap: 8, style: { flex: 1, minWidth: 0 }, children: [
             /* @__PURE__ */ jsxRuntime.jsx("div", { className: index_module_default2.iconContainer, children: renderIcon() }),
-            /* @__PURE__ */ jsxRuntime.jsx("span", { className: index_module_default2.toolName, children: item.title || item.toolName || "Unknown Tool" }),
-            (status === "running" || status === "pending") && /* @__PURE__ */ jsxRuntime.jsx("div", { className: index_module_default2.statusIcon, style: { color: statusConfig.color }, children: statusConfig.icon }),
+            displayName ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: index_module_default2.toolName, children: displayName }) : /* @__PURE__ */ jsxRuntime.jsxs("span", { className: index_module_default2.toolNamePending, children: [
+              /* @__PURE__ */ jsxRuntime.jsx("span", { className: index_module_default2.dot }),
+              /* @__PURE__ */ jsxRuntime.jsx("span", { className: index_module_default2.dot }),
+              /* @__PURE__ */ jsxRuntime.jsx("span", { className: index_module_default2.dot })
+            ] }),
+            showLoading && /* @__PURE__ */ jsxRuntime.jsx("div", { className: index_module_default2.statusIcon, style: { color: token.colorPrimary }, children: /* @__PURE__ */ jsxRuntime.jsx(icons.LoadingOutlined, {}) }),
             item.duration && /* @__PURE__ */ jsxRuntime.jsxs(antd.Typography.Text, { className: index_module_default2.duration, children: [
               item.duration,
               "ms"
             ] })
           ] }),
-          children: /* @__PURE__ */ jsxRuntime.jsx(
+          children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: index_module_default2.contentScrollContainer, children: /* @__PURE__ */ jsxRuntime.jsx(
             CustomRender,
             {
               item,
@@ -4927,35 +5023,30 @@ var ToolCallItem = ({ item }) => {
               resultContent,
               errorMessage: item.errorMessage
             }
-          )
+          ) })
         }
       ]
     }
   );
 };
 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__namespace.default.memo(({ role, message: message3, messageIndex = -1, loading, containerRef, customComponents }) => {
   const content = React10.useMemo(() => {
     return (message3.content || []).filter((item) => {
       if (!RENDERABLE_MESSAGE_TYPES.includes(item.type)) {
         return false;
       }
-      if (item.type === "runStarted") {
-        return !!loading;
-      }
       if (item.type === "plan") {
         return !shouldHideA2uiPlan(item);
       }
       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;
     });
-  }, [loading, message3.content]);
+  }, [message3.content]);
   const quoteMsg = React10.useMemo(() => {
     const quoteMsg2 = {};
     if (message3.params) {
@@ -4969,29 +5060,46 @@ var MessageRender_default = React10__namespace.default.memo(({ role, message: me
     }
     return common.isEmptyObj(quoteMsg2) ? null : quoteMsg2;
   }, [message3.params, message3.quoteMsg]);
-  if (content.length === 0) return null;
+  const showPending = loading && (content.length === 0 || content[content.length - 1].type !== "text");
+  if (content.length === 0 && !showPending) return null;
+  const lastToolCallIndex = (() => {
+    let lastIdx = -1;
+    content.forEach((item, i) => {
+      if (item.type === "toolCall" || item.type === "toolResult") lastIdx = i;
+    });
+    return lastIdx;
+  })();
   return /* @__PURE__ */ jsxRuntime.jsxs(antd.Flex, { ref: containerRef, vertical: true, gap: 8, children: [
-    content.map((item, index) => {
-      return /* @__PURE__ */ jsxRuntime.jsx(
+    content.map((item, index) => /* @__PURE__ */ jsxRuntime.jsxs(React10__namespace.default.Fragment, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx(
         xV2.Bubble,
         {
           role: role.user,
           placement: role.placement,
           variant: item.type === "files" ? "borderless" : void 0,
           content: /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-            item.type === "runStarted" && /* @__PURE__ */ jsxRuntime.jsx(RunStartedNode, { loading }, `flow-start-${index}`),
             (item.type === "toolCall" || item.type === "toolResult") && /* @__PURE__ */ jsxRuntime.jsx(tool_call_item_default, { item }, `tool-call-${item.toolCallId || index}`),
-            item.type === "text" && /* @__PURE__ */ jsxRuntime.jsx(TextNode2, { item, role: message3.role, customComponents, message: message3, messageIndex }, `message-${index}`),
-            item.type === "stepError" && (item.errorMessage ? /* @__PURE__ */ jsxRuntime.jsx(XMarkdown_default, { message: message3, components: customComponents, content: item.errorMessage }) : null),
+            item.type === "text" && /* @__PURE__ */ jsxRuntime.jsx(
+              TextNode2,
+              {
+                item,
+                role: message3.role,
+                customComponents,
+                message: message3,
+                messageIndex
+              },
+              `message-${index}`
+            ),
+            (item.type === "stepError" || item.type === "runFailed") && (item.errorMessage ? /* @__PURE__ */ jsxRuntime.jsx(XMarkdown_default, { message: message3, components: customComponents, content: item.errorMessage }) : null),
             item.type === "files" && /* @__PURE__ */ jsxRuntime.jsx(FilesNode, { item }, `files-${index}`),
             item.type === "plan" && /* @__PURE__ */ jsxRuntime.jsx(A2uiPlanNode, { item }, `plan-${index}`)
           ] })
-        },
-        `message-${index}`
-      );
-    }),
-    quoteMsg && /* @__PURE__ */ jsxRuntime.jsx(QuoteMsgNode, { quoteMsg, role }),
-    messageIndex >= 0 ? /* @__PURE__ */ jsxRuntime.jsx(A2uiMessageCards, { messageIndex, message: message3 }) : null
+        }
+      ),
+      index === lastToolCallIndex && messageIndex >= 0 ? /* @__PURE__ */ jsxRuntime.jsx(A2uiMessageCards, { messageIndex, message: message3 }) : null
+    ] }, `message-${index}`)),
+    showPending && /* @__PURE__ */ jsxRuntime.jsx(xV2.Bubble, { role: role.user, placement: role.placement, content: /* @__PURE__ */ jsxRuntime.jsx(RunStartedNode, {}) }),
+    quoteMsg && /* @__PURE__ */ jsxRuntime.jsx(QuoteMsgNode, { quoteMsg, role })
   ] });
 });
 var WelcomeItem_default = ({ icon = true, title = true, description = true, prompts = true }) => {