@mastra/react 1.6.3 → 1.7.0-alpha.0

package/dist/index.js

@@ -1985,7 +1985,7 @@ const dbFromServerUiMessages = (uiMessages, metadata) => uiMessages.map((uiMsg)
 		}
 	};
 });
-const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContext: propsRequestContext, clientTools: hookClientTools, onSignalSent, onSignalEcho, onThreadSignalsUnsupported, enableThreadSignals = false, streamPath }) => {
+const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContext: propsRequestContext, clientTools: hookClientTools, onSignalSent, onSignalEcho, onThreadSignalsUnsupported, enableThreadSignals = false, streamPath, withInitialHistory }) => {
 	const threadSignalsDisabled = enableThreadSignals === false;
 	const _currentRunId = useRef(void 0);
 	const _onChunk = useRef(void 0);
@@ -2010,17 +2010,20 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 	const [isAwaitingToolApproval, setIsAwaitingToolApproval] = useState(false);
 	const baseClient = useMastraClient();
 	const [isRunning, setIsRunning] = useState(false);
+	const [subscriptionHistory, setSubscriptionHistory] = useState(void 0);
+	const historyKey = `${agentId}:${resourceId ?? ""}:${threadId ?? ""}`;
+	const hydratedMessages = withInitialHistory && subscriptionHistory?.key === historyKey ? subscriptionHistory.messages : initialMessages;
 	const lastHydration = useRef(void 0);
 	useEffect(() => {
 		const previous = lastHydration.current;
 		const sameThread = previous?.agentId === agentId && previous.resourceId === resourceId && previous.threadId === threadId;
-		if (sameThread && previous.initialMessages === initialMessages) return;
-		const formattedMessages = resolveInitialMessages(initialMessages ?? []);
+		if (sameThread && previous.initialMessages === hydratedMessages) return;
+		const formattedMessages = resolveInitialMessages(hydratedMessages ?? []);
 		lastHydration.current = {
 			agentId,
 			resourceId,
 			threadId,
-			initialMessages,
+			initialMessages: hydratedMessages,
 			formattedMessages
 		};
 		if (sameThread) {
@@ -2054,7 +2057,7 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		agentId,
 		resourceId,
 		threadId,
-		initialMessages,
+		hydratedMessages,
 		isRunning,
 		isAwaitingToolApproval
 	]);
@@ -2201,7 +2204,8 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		}).getAgent(agentId, void 0, { stream: streamPath });
 		_threadSubscriptionPromiseRef.current = subscriptionAgent.subscribeToThread({
 			resourceId,
-			threadId
+			threadId,
+			...withInitialHistory ? { withInitialHistory } : {}
 		}).then((response) => {
 			const subscription = response;
 			if (_threadSubscriptionAbortRef.current !== subscriptionAbort) {
@@ -2209,7 +2213,24 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 				return;
 			}
 			_threadSubscriptionRef.current = subscription;
-			subscription.processDataStream({ onChunk: (chunk) => processStreamChunk(chunk) }).catch((error) => {
+			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))];
+					});
+					setSubscriptionHistory({
+						key: `${agentId}:${resourceId ?? ""}:${threadId}`,
+						messages: chunk.payload.messages
+					});
+					return;
+				}
+				return processStreamChunk(chunk);
+			} }).catch((error) => {
 				if (!isAbortError(error)) {
 					console.error("[useChat] Thread subscription failed", error);
 					setIsRunning(false);
@@ -2237,7 +2258,8 @@ const useChat = ({ agentId, resourceId, threadId, initialMessages, requestContex
 		closeThreadSubscription,
 		markThreadSignalsUnsupported,
 		processStreamChunk,
-		streamPath
+		streamPath,
+		withInitialHistory
 	]);
 	useEffect(() => {
 		_threadSignalsUnsupportedRef.current = false;