@mastra/react 1.7.0-alpha.1 → 1.7.0-alpha.10

package/dist/index.js

@@ -1871,6 +1871,46 @@ const extractRunIdFromMessages = (messages) => {
 	for (const message of messages) for (const source of getRunIdMetadataSources(message.content?.metadata)) for (const entry of Object.values(source)) if (isRecord(entry) && typeof entry.runId === "string" && entry.runId.length > 0) return entry.runId;
 };
 //#endregion
+//#region src/agent/merge-history.ts
+const liveClientMessageId = (message) => {
+	const clientMessageId = message.content.metadata?.[CLIENT_MESSAGE_ID_KEY];
+	return typeof clientMessageId === "string" ? clientMessageId : void 0;
+};
+const storedClientMessageId = (message) => {
+	const signal = message.content.metadata?.signal;
+	const clientMessageId = isRecord$1(signal) && isRecord$1(signal.metadata) ? signal.metadata[CLIENT_MESSAGE_ID_KEY] : void 0;
+	return typeof clientMessageId === "string" ? clientMessageId : void 0;
+};
+const mergeHistoryIntoConversation = ({ conversation, history, previousHistory }) => {
+	const previousById = new Map(previousHistory.map((message) => [message.id, message]));
+	const live = conversation.filter((message) => previousById.get(message.id) !== message);
+	const liveById = new Map(live.map((message) => [message.id, message]));
+	const liveClientMessageIds = new Set(live.flatMap((message) => liveClientMessageId(message) ?? []));
+	const historyIds = new Set(history.map((message) => message.id));
+	const storedClientMessageIds = new Set(history.flatMap((message) => storedClientMessageId(message) ?? []));
+	const mergedHistory = history.map((message) => {
+		const liveCopy = liveById.get(message.id);
+		if (liveCopy) return liveCopy;
+		const clientMessageId = storedClientMessageId(message);
+		if (!clientMessageId || !liveClientMessageIds.has(clientMessageId)) return message;
+		return {
+			...message,
+			content: {
+				...message.content,
+				metadata: {
+					...message.content.metadata,
+					[CLIENT_MESSAGE_ID_KEY]: clientMessageId
+				}
+			}
+		};
+	});
+	const unstoredLive = live.filter((message) => {
+		const clientMessageId = liveClientMessageId(message);
+		return !historyIds.has(message.id) && !(clientMessageId && storedClientMessageIds.has(clientMessageId));
+	});
+	return [...mergedHistory, ...unstoredLive];
+};
+//#endregion
 //#region src/agent/hooks.ts
 const extractPendingToolApprovalIdsFromMessages = (messages, runId) => {
 	const pendingToolApprovalIds = /* @__PURE__ */ new Set();
@@ -2027,13 +2067,11 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			formattedMessages
 		};
 		if (sameThread) {
-			const previousById = new Map(previous.formattedMessages.map((message) => [message.id, message]));
-			setMessages((current) => {
-				const live = current.filter((message) => previousById.get(message.id) !== message);
-				const liveById = new Map(live.map((message) => [message.id, message]));
-				const historyIds = new Set(formattedMessages.map((message) => message.id));
-				return [...formattedMessages.map((message) => liveById.get(message.id) ?? message), ...live.filter((message) => !historyIds.has(message.id))];
-			});
+			setMessages((current) => mergeHistoryIntoConversation({
+				conversation: current,
+				history: formattedMessages,
+				previousHistory: previous.formattedMessages
+			}));
 			setTasks(liveTasks.current ?? extractLatestTasksFromMessages(formattedMessages));
 			const historyRunId = extractRunIdFromMessages(formattedMessages);
 			if (liveRunFinished.current) return;
@@ -2170,6 +2208,13 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 				pendingToolApprovalIdsRef.current.add(toolCallId);
 				setIsAwaitingToolApproval(true);
 			}
+			if (runId) {
+				if (!liveRunId.current || liveRunFinished.current) {
+					liveRunId.current = runId;
+					liveRunFinished.current = false;
+				}
+				if (liveRunId.current === runId) _currentRunId.current = runId;
+			}
 			setIsRunning(false);
 		}
 		if (isTerminal) {
@@ -2216,13 +2261,12 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 			subscription.processDataStream({ onChunk: (chunk) => {
 				if (chunk.type === "thread-history") {
 					const history = resolveInitialMessages(chunk.payload.messages);
-					const previousById = new Map((lastHydration.current?.formattedMessages ?? []).map((message) => [message.id, message]));
-					setMessages((current) => {
-						const live = current.filter((message) => previousById.get(message.id) !== message);
-						const liveById = new Map(live.map((message) => [message.id, message]));
-						const historyIds = new Set(history.map((message) => message.id));
-						return [...history.map((message) => liveById.get(message.id) ?? message), ...live.filter((message) => !historyIds.has(message.id))];
-					});
+					const previousHistory = lastHydration.current?.formattedMessages ?? [];
+					setMessages((current) => mergeHistoryIntoConversation({
+						conversation: current,
+						history,
+						previousHistory
+					}));
 					setSubscriptionHistory({
 						key: `${agentId}:${resourceId ?? ""}:${threadId}`,
 						messages: chunk.payload.messages