@mastra/client-js 1.57.0-alpha.0 → 1.57.0-alpha.2

package/dist/index.js

@@ -1056,11 +1056,51 @@ function processClientTools(clientTools) {
 	}));
 }
 //#endregion
+//#region src/utils/sse-event-splitter.ts
+/** Split SSE events without rescanning or copying an unfinished event on each read. */
+function createSseEventSplitter() {
+	let parts = [];
+	let pendingNewline = false;
+	return (text, isFinal = false) => {
+		const events = [];
+		let start = 0;
+		if (text) {
+			if (pendingNewline) {
+				if (text.startsWith("\n")) {
+					events.push(parts.join(""));
+					parts = [];
+					start = 1;
+				} else parts.push("\n");
+				pendingNewline = false;
+			}
+			let separator;
+			while ((separator = text.indexOf("\n\n", start)) !== -1) {
+				parts.push(text.slice(start, separator));
+				events.push(parts.join(""));
+				parts = [];
+				start = separator + 2;
+			}
+			if (start < text.length) {
+				pendingNewline = text.endsWith("\n");
+				const end = pendingNewline ? text.length - 1 : text.length;
+				if (start < end) parts.push(text.slice(start, end));
+			}
+		}
+		if (isFinal) {
+			if (pendingNewline) parts.push("\n");
+			events.push(parts.join(""));
+			parts = [];
+			pendingNewline = false;
+		}
+		return events;
+	};
+}
+//#endregion
 //#region src/utils/process-mastra-stream.ts
 async function sharedProcessMastraStream({ stream, onChunk, signal }) {
 	const reader = stream.getReader();
 	const decoder = new TextDecoder();
-	let buffer = "";
+	const splitEvents = createSseEventSplitter();
 	const abort = () => void reader.cancel();
 	if (signal?.aborted) abort();
 	else signal?.addEventListener("abort", abort, { once: true });
@@ -1068,9 +1108,7 @@ async function sharedProcessMastraStream({ stream, onChunk, signal }) {
 		while (true) {
 			const { done, value } = await reader.read();
 			if (done) break;
-			buffer += decoder.decode(value, { stream: true });
-			const lines = buffer.split("\n\n");
-			buffer = lines.pop() || "";
+			const lines = splitEvents(decoder.decode(value, { stream: true }));
 			for (const line of lines) if (line.startsWith("data: ")) {
 				const data = line.slice(6);
 				if (data === "[DONE]") return;
@@ -1870,10 +1908,18 @@ var Agent = class extends BaseResource {
 		};
 		return streamResponse;
 	}
-	async abortThread(params) {
+	/** Stops execution of a run, including runs without a memory thread. */
+	async abortRun(runId, options) {
+		return this.request(`/agents/${this.agentId}/runs/${encodeURIComponent(runId)}/abort`, {
+			method: "POST",
+			signal: options?.signal
+		});
+	}
+	async abortThread(params, options) {
 		const { resourceId, threadId, clearPendingSignals, expectedRunId } = params;
 		return this.request(`/agents/${this.agentId}/threads/abort`, {
 			method: "POST",
+			signal: options?.signal,
 			body: {
 				resourceId,
 				threadId,
@@ -2607,10 +2653,11 @@ var Agent = class extends BaseResource {
 	}
 	/**
 	* Creates the consumer-facing stream for the streaming methods. Cancelling the
-	* returned stream (or aborting `externalSignal`) aborts the underlying request
-	* and stops any client-tool continuations.
+	* returned stream or the client-wide signal detaches the HTTP observer and
+	* stops any client-tool continuations. Per-call execution cancellation is
+	* handled separately by processStreamResponse.
 	*/
-	createCancellableStream(externalSignal) {
+	createCancellableStream() {
 		const abortController = new AbortController();
 		let readableController;
 		return {
@@ -2623,10 +2670,63 @@ var Agent = class extends BaseResource {
 				}
 			}),
 			controller: readableController,
-			signal: mergeAbortSignals(abortController.signal, externalSignal, this.options.abortSignal)
+			signal: mergeAbortSignals(abortController.signal, this.options.abortSignal)
 		};
 	}
 	async processStreamResponse(processedParams, controller, route = "stream", signal) {
+		const suppliedRunId = processedParams.runId;
+		processedParams = {
+			...processedParams,
+			runId: processedParams.runId ?? v4()
+		};
+		const callerSignal = processedParams.abortSignal;
+		callerSignal?.throwIfAborted();
+		const transportAbort = new AbortController();
+		const cancellationAbort = new AbortController();
+		const detachSignal = signal;
+		signal = mergeAbortSignals(detachSignal, transportAbort.signal);
+		let cancellationTimer;
+		const stopCancellation = () => cancellationAbort.abort();
+		const cancelExecution = () => {
+			cancellationTimer = setTimeout(() => cancellationAbort.abort(/* @__PURE__ */ new Error("Agent run cancellation was not acknowledged")), 1e4);
+			(async () => {
+				try {
+					while (true) {
+						cancellationAbort.signal.throwIfAborted();
+						if ((await this.abortRun(processedParams.runId, { signal: cancellationAbort.signal })).aborted) return;
+						await new Promise((resolve, reject) => {
+							const onAbort = () => {
+								clearTimeout(timer);
+								reject(cancellationAbort.signal.reason);
+							};
+							const timer = setTimeout(() => {
+								cancellationAbort.signal.removeEventListener("abort", onAbort);
+								resolve();
+							}, 100);
+							cancellationAbort.signal.addEventListener("abort", onAbort, { once: true });
+							if (cancellationAbort.signal.aborted) onAbort();
+						});
+					}
+				} catch (error) {
+					if (!cancellationAbort.signal.aborted && !(error instanceof Error && "status" in error && (error.status === 404 || error.status === 501))) try {
+						controller.error(error);
+					} catch {}
+				} finally {
+					clearTimeout(cancellationTimer);
+					transportAbort.abort(callerSignal?.reason);
+				}
+			})();
+		};
+		const cleanupCancellation = () => {
+			callerSignal?.removeEventListener("abort", cancelExecution);
+			detachSignal?.removeEventListener("abort", stopCancellation);
+			clearTimeout(cancellationTimer);
+			stopCancellation();
+		};
+		detachSignal?.addEventListener("abort", stopCancellation, { once: true });
+		if (detachSignal?.aborted) stopCancellation();
+		callerSignal?.addEventListener("abort", cancelExecution, { once: true });
+		if (callerSignal?.aborted) cancelExecution();
 		const { memory } = processedParams ?? {};
 		const { resource, thread } = memory ?? {};
 		const threadId = processedParams.threadId ?? (typeof thread === "string" ? thread : thread?.id);
@@ -2643,9 +2743,15 @@ var Agent = class extends BaseResource {
 			body: requestBody,
 			stream: true,
 			signal
+		}).catch((error) => {
+			cleanupCancellation();
+			throw error;
 		});
-		if (!response.body) throw new Error("No response body");
-		const isAborted = () => Boolean(signal?.aborted);
+		if (!response.body) {
+			cleanupCancellation();
+			throw new Error("No response body");
+		}
+		const isAborted = () => Boolean(signal?.aborted || callerSignal?.aborted);
 		const isAbortError = (error) => isAborted() || error?.name === "AbortError";
 		const safeClose = () => {
 			try {
@@ -2658,18 +2764,16 @@ var Agent = class extends BaseResource {
 		};
 		try {
 			let messages = [];
-			let streamRunId = processedParams.runId;
+			let streamRunId = suppliedRunId;
 			let finishedHistory;
 			let suspended = false;
 			const resumedToolCallIds = /* @__PURE__ */ new Set();
 			const releaseOpenStream = streamRunId ? this.trackOpenStream(streamRunId) : () => {};
 			const [streamForController, streamForProcessing] = response.body.tee();
 			const decoder = new TextDecoder();
-			let pendingText = "";
+			const splitEvents = createSseEventSplitter();
 			const enqueueReadableText = (text, isFinal = false) => {
-				pendingText += text;
-				const lines = pendingText.split("\n\n");
-				pendingText = isFinal ? "" : lines.pop() ?? "";
+				const lines = splitEvents(text, isFinal);
 				for (const line of lines) {
 					if (!line.startsWith("data: ") || !line.includes("\"type\":\"finish\"")) continue;
 					try {
@@ -2876,10 +2980,12 @@ var Agent = class extends BaseResource {
 				} catch {}
 				safeClose();
 			}).finally(() => {
+				cleanupCancellation();
 				signal?.removeEventListener("abort", onAbort);
 				releaseOpenStream();
 			});
 		} catch (error) {
+			cleanupCancellation();
 			if (!isAbortError(error)) console.error("Error processing stream response:", error);
 		}
 		return response;
@@ -2977,7 +3083,7 @@ var Agent = class extends BaseResource {
 			clientTools: processClientTools(params.clientToolsResolver?.() ?? params.clientTools),
 			structuredOutput
 		};
-		const { readable, controller: readableController, signal } = this.createCancellableStream(params.abortSignal);
+		const { readable, controller: readableController, signal } = this.createCancellableStream();
 		const response = await this.processStreamResponse(processedParams, readableController, "stream", signal);
 		const streamResponse = new Response(readable, {
 			status: response.status,
@@ -3008,7 +3114,7 @@ var Agent = class extends BaseResource {
 			clientTools: processClientTools(params.clientToolsResolver?.() ?? params.clientTools),
 			structuredOutput
 		};
-		const { readable, controller: readableController, signal } = this.createCancellableStream(params.abortSignal);
+		const { readable, controller: readableController, signal } = this.createCancellableStream();
 		const response = await this.processStreamResponse(processedParams, readableController, "stream-until-idle", signal);
 		const streamResponse = new Response(readable, {
 			status: response.status,
@@ -3052,7 +3158,7 @@ var Agent = class extends BaseResource {
 			requestContext: parseClientRequestContext(requestContext),
 			clientTools: processClientTools(executableClientTools)
 		};
-		const { readable, controller: readableController, signal } = this.createCancellableStream(params.abortSignal);
+		const { readable, controller: readableController, signal } = this.createCancellableStream();
 		const response = await this.processStreamResponse(processedParams, readableController, "approve-tool-call", signal).catch((error) => {
 			releaseHold({ force: true });
 			throw error;
@@ -3089,7 +3195,7 @@ var Agent = class extends BaseResource {
 			requestContext: parseClientRequestContext(requestContext),
 			clientTools: processClientTools(executableClientTools)
 		};
-		const { readable, controller: readableController, signal } = this.createCancellableStream(params.abortSignal);
+		const { readable, controller: readableController, signal } = this.createCancellableStream();
 		const response = await this.processStreamResponse(processedParams, readableController, "decline-tool-call", signal).catch((error) => {
 			releaseHold({ force: true });
 			throw error;
@@ -3165,7 +3271,7 @@ var Agent = class extends BaseResource {
 				schema: standardSchemaToJSONSchema(toStandardSchema(options.structuredOutput.schema))
 			} : void 0
 		};
-		const { readable, controller: readableController, signal } = this.createCancellableStream(options.abortSignal);
+		const { readable, controller: readableController, signal } = this.createCancellableStream();
 		const response = await this.processStreamResponse(processedParams, readableController, "resume-stream", signal).catch((error) => {
 			releaseHold({ force: true });
 			throw error;
@@ -3234,7 +3340,7 @@ var Agent = class extends BaseResource {
 				schema: standardSchemaToJSONSchema(toStandardSchema(options.structuredOutput.schema))
 			} : void 0
 		};
-		const { readable, controller: readableController, signal } = this.createCancellableStream(options.abortSignal);
+		const { readable, controller: readableController, signal } = this.createCancellableStream();
 		const response = await this.processStreamResponse(processedParams, readableController, "resume-stream-until-idle", signal).catch((error) => {
 			releaseHold({ force: true });
 			throw error;
@@ -4392,7 +4498,7 @@ var Workflow = class extends BaseResource {
 	*/
 	async createRun(params) {
 		const searchParams = new URLSearchParams();
-		if (!!params?.runId) searchParams.set("runId", params.runId);
+		if (params?.runId) searchParams.set("runId", params.runId);
 		const res = await this.request(`/workflows/${this.workflowId}/create-run?${searchParams.toString()}`, {
 			method: "POST",
 			body: {
@@ -4950,7 +5056,7 @@ var AgentBuilder = class extends BaseResource {
 	*/
 	async createRun(params) {
 		const searchParams = new URLSearchParams();
-		if (!!params?.runId) searchParams.set("runId", params.runId);
+		if (params?.runId) searchParams.set("runId", params.runId);
 		const url = `/agent-builder/${this.actionId}/create-run${searchParams.toString() ? `?${searchParams.toString()}` : ""}`;
 		return this.request(url, { method: "POST" });
 	}