@mastra/client-js 1.56.0-alpha.6 → 1.56.0-alpha.8

package/dist/index.js

@@ -1,7 +1,7 @@
 import { v4 } from "@lukeed/uuid";
 import { getErrorFromUnknown } from "@mastra/core/error";
-import { standardSchemaToJSONSchema, toStandardSchema } from "@mastra/schema-compat/schema";
 import { RequestContext, RequestContext as RequestContext$1 } from "@mastra/core/request-context";
+import { standardSchemaToJSONSchema, toStandardSchema } from "@mastra/schema-compat/schema";
 import { zodToJsonSchema } from "@mastra/schema-compat/zod-to-json";
 import { MastraA2AError } from "@mastra/core/a2a/client";
 import { AgentCard, CancelTaskRequest, DeleteTaskPushNotificationConfigRequest, GetTaskPushNotificationConfigRequest, GetTaskRequest, ListTaskPushNotificationConfigsRequest, ListTaskPushNotificationConfigsResponse, ListTasksRequest, ListTasksResponse, SendMessageRequest, SendMessageResponse, StreamResponse, SubscribeToTaskRequest, Task, TaskPushNotificationConfig } from "@mastra/core/a2a/v1";
@@ -2620,6 +2620,7 @@ var Agent = class extends BaseResource {
 		try {
 			let messages = [];
 			let streamRunId = processedParams.runId;
+			let finishedHistory;
 			const [streamForController, streamForProcessing] = response.body.tee();
 			const decoder = new TextDecoder();
 			let pendingText = "";
@@ -2627,6 +2628,13 @@ var Agent = class extends BaseResource {
 				pendingText += text;
 				const lines = pendingText.split("\n\n");
 				pendingText = isFinal ? "" : lines.pop() ?? "";
+				for (const line of lines) {
+					if (!line.startsWith("data: ") || !line.includes("\"type\":\"finish\"")) continue;
+					try {
+						const all = JSON.parse(line.slice(6))?.payload?.messages?.all;
+						if (Array.isArray(all)) finishedHistory = all;
+					} catch {}
+				}
 				const readableLines = lines.filter((line) => line.trim() !== "[DONE]" && line.trim() !== "data: [DONE]").join("\n\n");
 				if (readableLines) safeEnqueue(new TextEncoder().encode(`${readableLines}\n\n`));
 			};
@@ -2780,12 +2788,12 @@ var Agent = class extends BaseResource {
 								role: "tool",
 								content: toolResultContents
 							};
-							const updatedMessages = threadId ? [toolResultMessage] : [
+							const updatedMessages = threadId ? [toolResultMessage] : (route === "resume-stream" || route === "approve-tool-call" || route === "decline-tool-call") && finishedHistory ? [...finishedHistory, toolResultMessage] : [
 								...Array.isArray(processedParams.messages) ? processedParams.messages : [],
 								...messages,
 								toolResultMessage
 							];
-							const recursionRoute = route === "resume-stream" ? "stream" : route === "resume-stream-until-idle" ? "stream-until-idle" : route;
+							const recursionRoute = route === "resume-stream" || route === "approve-tool-call" || route === "decline-tool-call" ? "stream" : route === "resume-stream-until-idle" ? "stream-until-idle" : route;
 							if (isAborted()) return;
 							try {
 								await this.processStreamResponse({
@@ -2986,7 +2994,8 @@ var Agent = class extends BaseResource {
 		const { requestContext, ...rest } = params;
 		const processedParams = {
 			...rest,
-			requestContext: parseClientRequestContext(requestContext)
+			requestContext: parseClientRequestContext(requestContext),
+			clientTools: processClientTools(params.clientToolsResolver?.() ?? params.clientTools)
 		};
 		const { readable, controller: readableController, signal } = this.createCancellableStream(params.abortSignal);
 		const response = await this.processStreamResponse(processedParams, readableController, "approve-tool-call", signal);
@@ -3017,7 +3026,8 @@ var Agent = class extends BaseResource {
 		const { requestContext, ...rest } = params;
 		const processedParams = {
 			...rest,
-			requestContext: parseClientRequestContext(requestContext)
+			requestContext: parseClientRequestContext(requestContext),
+			clientTools: processClientTools(params.clientToolsResolver?.() ?? params.clientTools)
 		};
 		const { readable, controller: readableController, signal } = this.createCancellableStream(params.abortSignal);
 		const response = await this.processStreamResponse(processedParams, readableController, "decline-tool-call", signal);
@@ -3174,28 +3184,70 @@ var Agent = class extends BaseResource {
 	* Used when `requireToolApproval` is enabled with generate() to allow the agent to proceed.
 	*/
 	async approveToolCallGenerate(params) {
-		const { requestContext, ...rest } = params;
-		return this.request(`/agents/${this.agentId}/approve-tool-call-generate`, {
+		const { requestContext, clientTools, clientToolsResolver, memory, ...rest } = params;
+		const response = await this.request(`/agents/${this.agentId}/approve-tool-call-generate`, {
 			method: "POST",
 			body: {
 				...rest,
-				requestContext: parseClientRequestContext(requestContext)
+				requestContext: parseClientRequestContext(requestContext),
+				clientTools: processClientTools(clientToolsResolver?.() ?? clientTools)
 			}
 		});
+		return this.continueResumedGenerate(response, {
+			requestContext,
+			clientTools,
+			clientToolsResolver,
+			memory
+		});
 	}
 	/**
 	* Declines a pending tool call and returns the complete response (non-streaming).
 	* Used when `requireToolApproval` is enabled with generate() to prevent tool execution.
 	*/
 	async declineToolCallGenerate(params) {
-		const { requestContext, ...rest } = params;
-		return this.request(`/agents/${this.agentId}/decline-tool-call-generate`, {
+		const { requestContext, clientTools, clientToolsResolver, memory, ...rest } = params;
+		const response = await this.request(`/agents/${this.agentId}/decline-tool-call-generate`, {
 			method: "POST",
 			body: {
 				...rest,
-				requestContext: parseClientRequestContext(requestContext)
+				requestContext: parseClientRequestContext(requestContext),
+				clientTools: processClientTools(clientToolsResolver?.() ?? clientTools)
 			}
 		});
+		return this.continueResumedGenerate(response, {
+			requestContext,
+			clientTools,
+			clientToolsResolver,
+			memory
+		});
+	}
+	/**
+	* Runs executable client tools the model called after an approval decision and continues on
+	* /generate, like generate() does. With memory the continuation sends only the new messages to the
+	* thread. Without memory it re-sends the conversation up to the last user turn, because the resume
+	* routes keep the earlier history server-side and drop it once the run finishes.
+	*/
+	async continueResumedGenerate(response, { requestContext, clientTools, clientToolsResolver, memory }) {
+		if (response.finishReason !== "tool-calls") return response;
+		const context = requestContext === void 0 || requestContext instanceof RequestContext$1 ? requestContext : new RequestContext$1(Object.entries(requestContext));
+		const threadId = typeof memory?.thread === "string" ? memory.thread : memory?.thread?.id;
+		const history = response.messages ?? [];
+		const priorTurns = history.slice(0, history.findLastIndex((message) => message.role === "user") + 1);
+		return executeToolCallAndRespond({
+			response,
+			params: {
+				messages: threadId ? [] : priorTurns,
+				clientTools: clientToolsResolver?.() ?? clientTools,
+				clientToolsResolver,
+				requestContext: context,
+				memory
+			},
+			agentId: this.agentId,
+			resourceId: memory?.resource,
+			threadId,
+			requestContext: context,
+			respondFn: (messages, options) => this.generate(messages, options)
+		});
 	}
 	/**
 	* Processes the stream response and handles tool calls