@zero-library/chat-copilot 3.1.6 → 3.1.7

package/dist/index.cjs.js

@@ -3291,6 +3291,135 @@ var A2uiComponents = {
   ReportViewer
 };
 
+// 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 [];
+  const tags = [];
+  const regex = new RegExp(A2UI_TAG_REGEX);
+  let match;
+  while ((match = regex.exec(text)) !== null) {
+    const tagId = match[1];
+    const json = match[2].trim();
+    if (!json) continue;
+    try {
+      const parsed = JSON.parse(json);
+      const commands = Array.isArray(parsed) ? parsed : [parsed];
+      if (commands.length) tags.push({ tagId, commands });
+    } catch {
+    }
+  }
+  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 : [];
+}
+function extractInlineSurfaceIdsFromMessage(message2) {
+  const surfaceIds = /* @__PURE__ */ new Set();
+  const items = Array.isArray(message2?.content) ? message2.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);
+      }
+    }
+  }
+  return surfaceIds;
+}
+function extractDismissedSurfaceIdsFromMessages(messages) {
+  const lastCreateIndexBySurface = /* @__PURE__ */ new Map();
+  const lastActionIndexBySurface = /* @__PURE__ */ new Map();
+  for (let messageIndex = 0; messageIndex < messages.length; messageIndex++) {
+    const message2 = messages[messageIndex];
+    const items = Array.isArray(message2?.content) ? message2.content : [];
+    for (const item of items) {
+      if (message2?.role !== 1) {
+        if (item?.type === "a2uiCommand" && item.command) {
+          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);
+              }
+            }
+          }
+        }
+      }
+      if (message2?.role === 1 && item?.type === "text") {
+        const text = item.messageContent || item.text || "";
+        if (typeof text !== "string" || !text.includes("a2ui_action.v1")) continue;
+        try {
+          const parsed = JSON.parse(text.trim());
+          if (parsed?.type !== "a2ui_action.v1") continue;
+          const surfaceId = String(parsed.surfaceId || "").trim();
+          if (!surfaceId) continue;
+          lastActionIndexBySurface.set(surfaceId, messageIndex);
+        } catch {
+        }
+      }
+    }
+  }
+  const dismissed = [];
+  for (const [surfaceId, actionIndex] of lastActionIndexBySurface) {
+    const createIndex = lastCreateIndexBySurface.get(surfaceId);
+    if (createIndex === void 0 || actionIndex > createIndex) {
+      dismissed.push(surfaceId);
+    }
+  }
+  return dismissed;
+}
+
 // src/components/CustomComponents/A2uiRuntime/controller/meta.ts
 function readProp(current, props, key) {
   return current[key] ?? props?.[key];
@@ -3458,19 +3587,8 @@ function inferModelPathFromSurfaceCommands(surfaceId, commands) {
   });
   return commonParentPath(paths);
 }
-function isSubmitLikeActionName(name) {
-  const trimmed = typeof name === "string" ? name.trim() : "";
-  return trimmed === "submit" || trimmed === "confirm" || trimmed.startsWith("submit_") || trimmed.endsWith(".confirm");
-}
-function isCancelLikeActionName(name) {
-  const trimmed = typeof name === "string" ? name.trim() : "";
-  return trimmed === "cancel" || trimmed === "qf.cancel" || trimmed.endsWith(".cancel");
-}
 function shouldOptimisticallyDismissSurface(actionName, context) {
-  if (isSubmitLikeActionName(actionName) || isCancelLikeActionName(actionName)) return true;
-  if (actionName === "qf.submit" || actionName === "qf.cancel") return true;
-  const submitFlag = context?.submit;
-  return submitFlag === true;
+  return true;
 }
 function buildDispatchContext(surfaceId, rawContext, commands) {
   let normalizedContext = normalizeActionContext(rawContext);
@@ -3769,6 +3887,7 @@ function buildWizardUpdateComponentsCommand(schema, stepId) {
 function createA2uiRuntimeState() {
   return {
     processedMessageCursors: [],
+    processedTagIds: [],
     serverCommands: [],
     localCommands: [],
     anchorIndexBySurface: {},
@@ -3828,6 +3947,57 @@ function initializeWizardSurface(state, surfaceId, effects, nextWizardSteps) {
     nextWizardSteps[surfaceId] = firstStepId.trim();
   }
 }
+function processA2uiCommand(cmd, messageIndex, messageId, nextState, effects, deletedSurfaceIds, nextWizardSteps) {
+  nextState.serverCommands.push(cmd);
+  nextState.lastA2uiHost = { id: messageId, index: messageIndex };
+  const surfaceId = extractSurfaceId2(cmd);
+  if (!surfaceId) return;
+  if (cmd?.createSurface) {
+    nextState.anchorIndexBySurface[surfaceId] = messageIndex;
+  } else if (nextState.anchorIndexBySurface[surfaceId] === void 0 && !cmd?.deleteSurface) {
+    nextState.anchorIndexBySurface[surfaceId] = messageIndex;
+  }
+  if (cmd?.createSurface) {
+    nextState.latestCreateCommandIndexBySurface[surfaceId] = nextState.serverCommands.length - 1;
+    nextState.optimisticallyDismissedSurfaceIds = nextState.optimisticallyDismissedSurfaceIds.filter((id) => id !== surfaceId);
+    initializeWizardSurface(nextState, surfaceId, effects, nextWizardSteps);
+  }
+  if (cmd?.updateDataModel) {
+    const { path, value } = cmd.updateDataModel;
+    if (typeof path === "string" && path.trim() && value && typeof value === "object" && !Array.isArray(value)) {
+      effects.push({ type: "write-model", modelPath: path, values: value });
+    }
+  }
+  if (cmd?.deleteSurface) {
+    deletedSurfaceIds.add(surfaceId);
+    const modelPath = nextState.modelPathBySurface[surfaceId];
+    if (modelPath) effects.push({ type: "clear-model", modelPath });
+    delete nextState.initializedWizardRevisionBySurface[surfaceId];
+    delete nextState.modelPathBySurface[surfaceId];
+  }
+}
+function scanA2uiTagsFromMessages(messages, processedTagIds) {
+  const newTags = [];
+  const newTagIds = [];
+  for (let messageIndex = 0; messageIndex < messages.length; messageIndex += 1) {
+    const message2 = messages[messageIndex];
+    const messageId = String(message2?.messageId ?? messageIndex);
+    const items = Array.isArray(message2?.content) ? message2.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) {
+        if (processedTagIds.has(tag.tagId)) continue;
+        processedTagIds.add(tag.tagId);
+        newTagIds.push(tag.tagId);
+        newTags.push({ commands: tag.commands, messageIndex, messageId });
+      }
+    }
+  }
+  return { newTags, newTagIds };
+}
 function reduceA2uiRuntimeMessages(state, messages) {
   const { shouldReplayAll, pendingItems, nextCursors } = diffConversationMessages(messages || [], state.processedMessageCursors);
   const itemsToProcess = shouldReplayAll ? messages.flatMap((message2, messageIndex) => {
@@ -3835,11 +4005,14 @@ function reduceA2uiRuntimeMessages(state, messages) {
     const items = Array.isArray(message2?.content) ? message2.content : [];
     return items.map((item) => ({ messageIndex, messageId, item }));
   }) : pendingItems;
-  if (!shouldReplayAll && itemsToProcess.length === 0) {
+  const tagProcessedSet = new Set(shouldReplayAll ? [] : state.processedTagIds);
+  const { newTags, newTagIds } = scanA2uiTagsFromMessages(messages || [], tagProcessedSet);
+  if (!shouldReplayAll && itemsToProcess.length === 0 && newTags.length === 0) {
     return { state, effects: [] };
   }
   const nextState = shouldReplayAll ? createA2uiRuntimeState() : { ...state };
   nextState.processedMessageCursors = shouldReplayAll ? [] : [...state.processedMessageCursors];
+  nextState.processedTagIds = shouldReplayAll ? [] : [...state.processedTagIds, ...newTagIds];
   nextState.serverCommands = shouldReplayAll ? [] : [...state.serverCommands];
   nextState.localCommands = shouldReplayAll ? [] : [...state.localCommands];
   nextState.anchorIndexBySurface = shouldReplayAll ? {} : { ...state.anchorIndexBySurface };
@@ -3862,24 +4035,13 @@ function reduceA2uiRuntimeMessages(state, messages) {
       }
       return;
     }
-    if (item?.type !== "a2uiCommand" || !item.command) return;
-    nextState.serverCommands.push(item.command);
-    nextState.lastA2uiHost = { id: messageId, index: messageIndex };
-    const surfaceId = extractSurfaceId2(item.command);
-    if (!surfaceId) return;
-    if (nextState.anchorIndexBySurface[surfaceId] === void 0 && !item.command?.deleteSurface) {
-      nextState.anchorIndexBySurface[surfaceId] = messageIndex;
-    }
-    if (item.command?.createSurface) {
-      nextState.latestCreateCommandIndexBySurface[surfaceId] = nextState.serverCommands.length - 1;
-      initializeWizardSurface(nextState, surfaceId, effects, nextWizardSteps);
-    }
-    if (item.command?.deleteSurface) {
-      deletedSurfaceIds.add(surfaceId);
-      const modelPath = nextState.modelPathBySurface[surfaceId];
-      if (modelPath) effects.push({ type: "clear-model", modelPath });
-      delete nextState.initializedWizardRevisionBySurface[surfaceId];
-      delete nextState.modelPathBySurface[surfaceId];
+    if (item?.type === "a2uiCommand" && item.command) {
+      processA2uiCommand(item.command, messageIndex, messageId, nextState, effects, deletedSurfaceIds, nextWizardSteps);
+    }
+  });
+  newTags.forEach(({ commands, messageIndex, messageId }) => {
+    for (const cmd of commands) {
+      processA2uiCommand(cmd, messageIndex, messageId, nextState, effects, deletedSurfaceIds, nextWizardSteps);
     }
   });
   nextState.processedMessageCursors = shouldReplayAll ? messages.map((message2, messageIndex) => ({
@@ -3899,7 +4061,7 @@ function reduceA2uiRuntimeMessages(state, messages) {
   return { state: nextState, effects };
 }
 function reduceA2uiRuntimeAction(state, input) {
-  const { surfaceId, actionName, rawContext } = input;
+  const { surfaceId, actionName} = input;
   if (!surfaceId) {
     return { state, handled: actionName === "wizard.next" || actionName === "wizard.back" };
   }
@@ -3929,9 +4091,6 @@ function reduceA2uiRuntimeAction(state, input) {
   if (actionName === "wizard.next" || actionName === "wizard.back") {
     return { state, handled: true };
   }
-  if (!shouldOptimisticallyDismissSurface(actionName, rawContext)) {
-    return { state, handled: false };
-  }
   if (state.optimisticallyDismissedSurfaceIds.includes(surfaceId)) {
     return { state, handled: false };
   }
@@ -3996,12 +4155,20 @@ function useA2uiController(params) {
     applyA2uiRuntimeEffects(result.effects);
     setRuntimeState(result.state);
   }, [conversationMessages, conversationId]);
-  const view = React10.useMemo(() => selectA2uiRuntimeView(runtimeState, dismissedSurfaceIds), [runtimeState, dismissedSurfaceIds]);
+  const permanentDismissedSurfaceIds = React10.useMemo(
+    () => extractDismissedSurfaceIdsFromMessages(conversationMessages || []),
+    [conversationMessages]
+  );
+  const mergedDismissedSurfaceIds = React10.useMemo(
+    () => Array.from(/* @__PURE__ */ new Set([...dismissedSurfaceIds || [], ...permanentDismissedSurfaceIds])),
+    [dismissedSurfaceIds, permanentDismissedSurfaceIds]
+  );
+  const view = React10.useMemo(() => selectA2uiRuntimeView(runtimeState, mergedDismissedSurfaceIds), [runtimeState, mergedDismissedSurfaceIds]);
   const handleRuntimeAction = React10.useCallback((payload) => {
     const surfaceId = String(payload?.surfaceId || payload?.cardId || "");
     const name = String(payload?.name || payload?.event?.name || "").trim();
     const rawContext = payload?.context || payload?.event?.context || {};
-    const runtimeActionResult = reduceA2uiRuntimeAction(runtimeRef.current, { surfaceId, actionName: name, rawContext });
+    const runtimeActionResult = reduceA2uiRuntimeAction(runtimeRef.current, { surfaceId, actionName: name});
     if (runtimeActionResult.state !== runtimeRef.current) {
       runtimeRef.current = runtimeActionResult.state;
       setRuntimeState(runtimeActionResult.state);
@@ -4028,26 +4195,26 @@ var A2uiRuntimeContext = React10__namespace.default.createContext({
 function useA2uiRuntimeView() {
   return React10__namespace.default.useContext(A2uiRuntimeContext);
 }
-function A2uiMessageCards({ messageIndex }) {
+function A2uiMessageCards({ messageIndex, message: message2 }) {
   const { surfaceIdsByMessageIndex } = useA2uiRuntimeView();
-  const surfaceIds = surfaceIdsByMessageIndex[messageIndex] || [];
+  const allSurfaceIds = surfaceIdsByMessageIndex[messageIndex] || [];
+  const inlineSurfaceIds = message2 ? extractInlineSurfaceIdsFromMessage(message2) : /* @__PURE__ */ new Set();
+  const surfaceIds = allSurfaceIds.filter((id) => !inlineSurfaceIds.has(id));
   if (!surfaceIds.length) return null;
   return /* @__PURE__ */ jsxRuntime.jsx("div", { children: surfaceIds.map((surfaceId) => /* @__PURE__ */ jsxRuntime.jsx(XCard.Card, { id: surfaceId }, surfaceId)) });
 }
 
 // src/components/CustomComponents/A2uiRuntime/renderer/protocol.ts
-function isSubmitLikeActionName2(name) {
+function isSubmitLikeActionName(name) {
   const normalized = String(name || "").trim();
   return normalized === "submit" || normalized === "confirm" || normalized.startsWith("submit_") || normalized.endsWith(".confirm");
 }
-function isCancelLikeActionName2(name) {
+function isCancelLikeActionName(name) {
   const normalized = String(name || "").trim();
   return normalized === "cancel" || normalized === "qf.cancel" || normalized.endsWith(".cancel");
 }
 function shouldDismissA2uiSurface(name, context) {
-  if (isSubmitLikeActionName2(name) || isCancelLikeActionName2(name)) return true;
-  if (name === "qf.submit" || name === "qf.cancel") return true;
-  return context?.submit === true;
+  return true;
 }
 function normalizeA2uiActionPayload(payload) {
   return {
@@ -4081,7 +4248,7 @@ function isQuestionActionPayload(payload) {
   const mode = payload.context?.form_mode;
   if (payload.name === "qf.submit" || payload.name === "qf.cancel") return true;
   if (payload.name.startsWith("qf.")) return true;
-  return typeof mode === "string" && mode.toLowerCase() === "ephemeral" ? isSubmitLikeActionName2(payload.name) || isCancelLikeActionName2(payload.name) : false;
+  return typeof mode === "string" && mode.toLowerCase() === "ephemeral" ? isSubmitLikeActionName(payload.name) || isCancelLikeActionName(payload.name) : false;
 }
 function formatActionValue(value, displayOverride) {
   if (typeof displayOverride === "string" && displayOverride.trim()) return displayOverride.trim();
@@ -4091,7 +4258,7 @@ function formatActionValue(value, displayOverride) {
   return String(value);
 }
 function buildQuestionSummary(payload) {
-  if (isCancelLikeActionName2(payload.name)) return "Question: \u5DF2\u53D6\u6D88";
+  if (isCancelLikeActionName(payload.name)) return "Question: \u5DF2\u53D6\u6D88";
   const values = payload.context.values && typeof payload.context.values === "object" && !Array.isArray(payload.context.values) ? payload.context.values : payload.context;
   const labels = payload.context.labels && typeof payload.context.labels === "object" && !Array.isArray(payload.context.labels) ? payload.context.labels : {};
   const valueLabels = payload.context.valueLabels && typeof payload.context.valueLabels === "object" && !Array.isArray(payload.context.valueLabels) ? payload.context.valueLabels : {};
@@ -4113,10 +4280,22 @@ function formatA2uiActionDisplayText(payload) {
     back_to_params: "\u5DF2\u8FD4\u56DE\u4FEE\u6539\u53C2\u6570",
     confirm: "\u5DF2\u786E\u8BA4\u521B\u5EFA"
   };
-  const actionLabel = actionLabels[payload.name] || `\u5DF2\u63D0\u4EA4\u52A8\u4F5C (${payload.name})`;
+  let actionLabel = actionLabels[payload.name];
+  if (!actionLabel) {
+    if (payload.name.startsWith("confirm_")) {
+      actionLabel = "\u5DF2\u9009\u62E9";
+    } else if (payload.name.startsWith("submit_")) {
+      actionLabel = "\u5DF2\u63D0\u4EA4";
+    } else {
+      actionLabel = `\u5DF2\u63D0\u4EA4\u52A8\u4F5C (${payload.name})`;
+    }
+  }
+  const isConfirmLike = payload.name.startsWith("confirm_");
   const details = Object.entries(values).filter(([, value]) => value !== null && value !== void 0 && value !== "").map(([key, value]) => {
+    const formatted = formatActionValue(value, valueLabels[key]);
+    if (isConfirmLike) return formatted;
     const label = typeof labels[key] === "string" && String(labels[key]).trim() ? String(labels[key]).trim() : key;
-    return `${label}: ${formatActionValue(value, valueLabels[key])}`;
+    return `${label}: ${formatted}`;
   });
   return details.length ? `${actionLabel}\uFF1A${details.join("\uFF1B ")}` : actionLabel;
 }
@@ -4214,66 +4393,46 @@ function readContextModelPath(context) {
   const path = context?.model && typeof context.model === "object" ? context.model.path : "";
   return typeof path === "string" ? path.trim() : "";
 }
-function diffMessages(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 message2 = messages[messageIndex];
-    const messageId = String(message2?.messageId ?? messageIndex);
+function buildLatestCommandIndexBySurface(messages) {
+  const indexBySurface = {};
+  let commandIndex = -1;
+  for (const message2 of messages) {
     const items = Array.isArray(message2?.content) ? message2.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({ item: items[itemIndex] });
+    for (const item of items) {
+      if (item?.type === "a2uiCommand" && item.command) {
+        commandIndex += 1;
+        const surfaceId = extractSurfaceId3(item.command);
+        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;
+          }
+        }
+      }
     }
-    nextCursors.push({ messageId, contentLength: items.length });
   }
-  return { shouldReplayAll: false, nextCursors, pendingItems };
+  return indexBySurface;
 }
 function A2uiRuntimeProvider({ messages, children }) {
   const chatStore = useChatStore();
   const conversationState = valtio.useSnapshot(chatStore.conversation);
   const conversationId = conversationState.active.id;
-  const processedMessageCursorsRef = React10__namespace.default.useRef([]);
-  const latestCommandIndexBySurfaceRef = React10__namespace.default.useRef({});
-  const commandIndexRef = React10__namespace.default.useRef(-1);
   const [latestCommandIndexBySurface, setLatestCommandIndexBySurface] = React10__namespace.default.useState({});
   const [dismissedAtBySurface, setDismissedAtBySurface] = React10__namespace.default.useState({});
   React10__namespace.default.useEffect(() => {
-    processedMessageCursorsRef.current = [];
-    latestCommandIndexBySurfaceRef.current = {};
-    commandIndexRef.current = -1;
     setLatestCommandIndexBySurface({});
     setDismissedAtBySurface({});
   }, [conversationId]);
   React10__namespace.default.useEffect(() => {
-    const { shouldReplayAll, nextCursors, pendingItems } = diffMessages(messages, processedMessageCursorsRef.current);
-    const itemsToProcess = shouldReplayAll ? messages.flatMap((message2) => {
-      const items = Array.isArray(message2?.content) ? message2.content : [];
-      return items.map((item) => ({ item }));
-    }) : pendingItems;
-    if (!shouldReplayAll && itemsToProcess.length === 0) return;
-    const nextLatestCommandIndexBySurface = shouldReplayAll ? {} : { ...latestCommandIndexBySurfaceRef.current };
-    let nextCommandIndex = shouldReplayAll ? -1 : commandIndexRef.current;
-    itemsToProcess.forEach(({ item }) => {
-      if (item?.type !== "a2uiCommand" || !item.command) return;
-      nextCommandIndex += 1;
-      const surfaceId = extractSurfaceId3(item.command);
-      if (surfaceId) nextLatestCommandIndexBySurface[surfaceId] = nextCommandIndex;
-    });
-    processedMessageCursorsRef.current = shouldReplayAll ? messages.map((message2, messageIndex) => ({
-      messageId: String(message2?.messageId ?? messageIndex),
-      contentLength: Array.isArray(message2?.content) ? message2.content.length : 0
-    })) : nextCursors;
-    latestCommandIndexBySurfaceRef.current = nextLatestCommandIndexBySurface;
-    commandIndexRef.current = nextCommandIndex;
-    setLatestCommandIndexBySurface(nextLatestCommandIndexBySurface);
+    setLatestCommandIndexBySurface(buildLatestCommandIndexBySurface(messages));
   }, [messages]);
   const dismissedSurfaceIds = React10__namespace.default.useMemo(() => {
     return Object.entries(dismissedAtBySurface).filter(([surfaceId, dismissedAt]) => (latestCommandIndexBySurface[surfaceId] ?? -1) <= dismissedAt).map(([surfaceId]) => surfaceId);
@@ -4402,14 +4561,37 @@ function QuestionSummary({ content }) {
   ] });
 }
 var TextNode2 = React10__namespace.default.memo(
-  ({ item, role, customComponents, message: message2 }) => {
-    const content = toA2uiDisplayText(role, item?.messageContent);
-    if (typeof content === "string" && content.startsWith("Question:")) {
-      return /* @__PURE__ */ jsxRuntime.jsx(QuestionSummary, { content });
+  ({
+    item,
+    role,
+    customComponents,
+    message: message2,
+    messageIndex = -1
+  }) => {
+    const { surfaceIdsByMessageIndex } = useA2uiRuntimeView();
+    const rawContent = toA2uiDisplayText(role, item?.messageContent);
+    const segments = splitA2uiTextSegments(rawContent);
+    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 });
+      }
+      return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+        !!item.reasoningContent && /* @__PURE__ */ jsxRuntime.jsx(xV2.Think, { title: "\u6DF1\u5EA6\u601D\u8003", children: item.reasoningContent }),
+        !!content && /* @__PURE__ */ jsxRuntime.jsx(XMarkdown_default, { message: message2, components: customComponents, content })
+      ] });
     }
     return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
       !!item.reasoningContent && /* @__PURE__ */ jsxRuntime.jsx(xV2.Think, { title: "\u6DF1\u5EA6\u601D\u8003", children: item.reasoningContent }),
-      !!content && /* @__PURE__ */ jsxRuntime.jsx(XMarkdown_default, { message: message2, components: customComponents, content })
+      segments.map((seg, i) => {
+        if (seg.type === "text") {
+          return seg.content.trim() ? /* @__PURE__ */ jsxRuntime.jsx(XMarkdown_default, { message: message2, components: customComponents, content: seg.content }, `text-${i}`) : null;
+        }
+        return seg.surfaceIds.filter((sid) => !visibleSurfaceIds || visibleSurfaceIds.has(sid)).map((sid) => /* @__PURE__ */ jsxRuntime.jsx(XCard.Card, { id: sid }, `a2ui-${i}-${sid}`));
+      })
     ] });
   }
 );
@@ -4637,6 +4819,12 @@ var MessageRender_default = React10__namespace.default.memo(({ role, message: me
       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 true;
     });
   }, [loading, message2.content]);
@@ -4665,7 +4853,7 @@ var MessageRender_default = React10__namespace.default.memo(({ role, message: me
           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: message2.role, customComponents, message: message2 }, `message-${index}`),
+            item.type === "text" && /* @__PURE__ */ jsxRuntime.jsx(TextNode2, { item, role: message2.role, customComponents, message: message2, messageIndex }, `message-${index}`),
             item.type === "stepError" && (item.errorMessage ? /* @__PURE__ */ jsxRuntime.jsx(XMarkdown_default, { message: message2, 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}`)
@@ -4675,7 +4863,7 @@ var MessageRender_default = React10__namespace.default.memo(({ role, message: me
       );
     }),
     quoteMsg && /* @__PURE__ */ jsxRuntime.jsx(QuoteMsgNode, { quoteMsg, role }),
-    messageIndex >= 0 ? /* @__PURE__ */ jsxRuntime.jsx(A2uiMessageCards, { messageIndex }) : null
+    messageIndex >= 0 ? /* @__PURE__ */ jsxRuntime.jsx(A2uiMessageCards, { messageIndex, message: message2 }) : null
   ] });
 });
 var WelcomeItem_default = ({ icon = true, title = true, description = true, prompts = true }) => {