@mastra/react 1.5.1-alpha.0 → 1.5.1-alpha.2

package/dist/index.js

@@ -128,6 +128,18 @@ const formatStreamCompletionFeedback = (result, maxIterationReached) => {
 const CLIENT_MESSAGE_ID_KEY = "clientMessageId";
 //#endregion
 //#region src/lib/mastra-db/accumulator.ts
+function toolErrorText(error) {
+	if (error && typeof error === "object") {
+		if ("message" in error && typeof error.message === "string") return error.message;
+		if ("cause" in error) {
+			const cause = error.cause;
+			if (cause && typeof cause === "object") {
+				if (("id" in cause ? cause.id : "code" in cause ? cause.code : void 0) === "AGENT_AGENT_TOOL_EXECUTION_FAILED" && "message" in cause && typeof cause.message === "string") return cause.message;
+			}
+		}
+	}
+	return String(error);
+}
 const cloneMetadata = (metadata) => metadata ? { ...metadata } : {};
 const withParts = (message, parts) => ({
 	...message,
@@ -807,8 +819,7 @@ const accumulateChunk = ({ chunk, conversation, metadata }) => {
 				const { toolName, toolCallId, args } = toolPart.toolInvocation;
 				const providerMeta = payloadProviderMetadata ?? toolPart.providerMetadata;
 				if (chunk.type === "tool-error" || chunk.type === "background-task-failed" || payloadIsError) {
-					const error = chunk.type === "tool-error" || chunk.type === "background-task-failed" ? payloadError : payloadResult;
-					const errorText = typeof error === "string" ? error : error instanceof Error ? error.message : error?.message ?? String(error);
+					const errorText = toolErrorText(chunk.type === "tool-error" || chunk.type === "background-task-failed" ? payloadError : payloadResult);
 					parts[toolPartIndex] = {
 						...toolPart,
 						providerMetadata: providerMeta,
@@ -817,7 +828,8 @@ const accumulateChunk = ({ chunk, conversation, metadata }) => {
 							toolCallId,
 							toolName,
 							args,
-							errorText
+							errorText,
+							...toolName?.startsWith("agent-") ? { result: toolPart.toolInvocation.result } : {}
 						}
 					};
 				} else {
@@ -1006,7 +1018,7 @@ const accumulateChunk = ({ chunk, conversation, metadata }) => {
 						mode: "stream",
 						requireApprovalMetadata: {
 							...lastRequireApproval,
-							[chunk.payload.toolName]: {
+							[chunk.payload.toolCallId]: {
 								toolCallId: chunk.payload.toolCallId,
 								toolName: chunk.payload.toolName,
 								args: chunk.payload.args