@mastra/client-js 1.56.0-alpha.5 → 1.56.0-alpha.7

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-client-js
 description: Documentation for @mastra/client-js. Use when working with @mastra/client-js APIs, configuration, or implementation.
 metadata:
   package: "@mastra/client-js"
-  version: "1.56.0-alpha.5"
+  version: "1.56.0-alpha.7"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.56.0-alpha.5",
+  "version": "1.56.0-alpha.7",
   "package": "@mastra/client-js",
   "exports": {},
   "modules": {}

package/dist/docs/references/reference-client-js-agents.md

@@ -321,6 +321,26 @@ await subscription.processDataStream({
 
 Pass `withInitialHistory: true` (or `{ perPage }`) to receive the stored messages as a first `thread-history` chunk instead of fetching history separately. Finished runs aren't replayed after it, so completed answers don't stream again on reconnect.
 
+In the React SDK, `useChat()` exposes the `hasMore` flag from that first page as `initialHistoryPagination`, so you can decide whether to offer loading older messages without another history request:
+
+```typescript
+import { useChat } from '@mastra/react'
+
+const { messages, initialHistoryPagination } = useChat({
+  agentId: 'support-agent',
+  resourceId: 'user-123',
+  threadId: 'thread-abc',
+  enableThreadSignals: true,
+  withInitialHistory: { perPage: 20 },
+})
+
+// { hasMore: true }: older messages exist
+// { hasMore: false }: the page reaches the start of the thread
+// undefined: history is disabled, still loading, or the subscription ended
+```
+
+`initialHistoryPagination` only describes the initial subscription page for the current agent, resource, thread, and `withInitialHistory` value. It isn't changed by live output or `setMessages()`. After you load older pages yourself, use the `hasMore` value from those responses.
+
 `subscribeToThread()` returns the underlying `Response` plus a `processDataStream()` helper. The helper reads the subscription stream until the connection closes or the request is aborted. Pass `reconnect: true` to resubscribe when the transport closes or a reconnect request fails, such as after a proxy idle timeout. If a reconnect request fails with a 4xx status (for example `401` or `403`) or `501`, `processDataStream()` stops reconnecting and rejects with the original `MastraClientError`. `408` and `429` are still retried.
 
 **resourceId** (`string`): Resource ID for the memory thread.

package/dist/index.cjs

@@ -23,8 +23,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 let _lukeed_uuid = require("@lukeed/uuid");
 let _mastra_core_error = require("@mastra/core/error");
-let _mastra_schema_compat_schema = require("@mastra/schema-compat/schema");
 let _mastra_core_request_context = require("@mastra/core/request-context");
+let _mastra_schema_compat_schema = require("@mastra/schema-compat/schema");
 let _mastra_schema_compat_zod_to_json = require("@mastra/schema-compat/zod-to-json");
 let _mastra_core_a2a_client = require("@mastra/core/a2a/client");
 let _mastra_core_a2a_v1 = require("@mastra/core/a2a/v1");
@@ -2644,6 +2644,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 = "";
@@ -2651,6 +2652,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`));
 			};
@@ -2804,12 +2812,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({
@@ -3010,7 +3018,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);
@@ -3041,7 +3050,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);
@@ -3198,28 +3208,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 _mastra_core_request_context.RequestContext ? requestContext : new _mastra_core_request_context.RequestContext(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