@mastra/server 1.82.0-alpha.1 → 1.82.0-alpha.3

package/dist/{dist-CPj7ZQaO.cjs → dist-BKNKucT9.cjs}

@@ -1,6 +1,6 @@
 const require_rolldown_runtime = require("./rolldown-runtime-10nMEhjP.cjs");
 const require_schema_Bf12g7KC = require("./schema-Bf12g7KC-plP4Ir6h.cjs");
-require("./utils-bQ6Jhog6.cjs");
+require("./utils-BhBJHsqX.cjs");
 const require_dist = require("./dist-BZGewCGq.cjs");
 let zod_v4 = require("zod/v4");
 zod_v4 = require_rolldown_runtime.__toESM(zod_v4, 1);
@@ -8654,7 +8654,7 @@ function splitLines(text) {
 	else result.push(result.pop().slice(0, -1));
 	return result;
 }
-// ../memory/dist/src-CBYx0iwC.js
+// ../memory/dist/src-BncFunCW.js
 var __defProp$3 = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -8666,7 +8666,7 @@ var __exportAll = (all, no_symbols) => {
 	return target;
 };
 var marker$21 = "vercel.ai.error";
-var symbol$12 = Symbol.for(marker$21);
+var symbol$25 = Symbol.for(marker$21);
 var _a$7;
 var _AISDKError = class _AISDKError extends Error {
 	/**
@@ -8696,7 +8696,7 @@ var _AISDKError = class _AISDKError extends Error {
 		return error != null && typeof error === "object" && markerSymbol in error && typeof error[markerSymbol] === "boolean" && error[markerSymbol] === true;
 	}
 };
-_a$7 = symbol$12;
+_a$7 = symbol$25;
 var AISDKError$3 = _AISDKError;
 var name$22 = "AI_APICallError";
 var marker2$7 = `vercel.ai.error.${name$22}`;
@@ -11406,14 +11406,14 @@ var UnsupportedModelVersionError$3 = class extends AISDKError$3 {
 		});
 	}
 };
-var name$15 = "AI_InvalidArgumentError";
-var marker$10 = `vercel.ai.error.${name$15}`;
-var symbol$25 = Symbol.for(marker$10);
+var name$21 = "AI_InvalidArgumentError";
+var marker$10 = `vercel.ai.error.${name$21}`;
+var symbol$12 = Symbol.for(marker$10);
 var _a$6;
 var InvalidArgumentError$6 = class extends AISDKError$3 {
 	constructor({ parameter, value, message }) {
 		super({
-			name: name$15,
+			name: name$21,
 			message: `Invalid argument for parameter ${parameter}: ${message}`
 		});
 		this[_a$6] = true;
@@ -11424,7 +11424,7 @@ var InvalidArgumentError$6 = class extends AISDKError$3 {
 		return AISDKError$3.hasMarker(error, marker$10);
 	}
 };
-_a$6 = symbol$25;
+_a$6 = symbol$12;
 var name2$6 = "AI_RetryError";
 var marker2$6 = `vercel.ai.error.${name2$6}`;
 var symbol2$6 = Symbol.for(marker2$6);
@@ -12314,8 +12314,8 @@ function trimStartOfStream() {
 		return text2;
 	};
 }
-var marker$1$17 = "vercel.ai.error";
-var symbol$1$17 = Symbol.for(marker$1$17);
+var marker$1$16 = "vercel.ai.error";
+var symbol$1$17 = Symbol.for(marker$1$16);
 var _a$1$2;
 var _b$1$4;
 var AISDKError$2 = class _AISDKError extends (_b$1$4 = Error, _a$1$2 = symbol$1$17, _b$1$4) {
@@ -12339,22 +12339,22 @@ var AISDKError$2 = class _AISDKError extends (_b$1$4 = Error, _a$1$2 = symbol$1$
 	* @returns {boolean} True if the error is an AI SDK Error, false otherwise.
 	*/
 	static isInstance(error) {
-		return _AISDKError.hasMarker(error, marker$1$17);
+		return _AISDKError.hasMarker(error, marker$1$16);
 	}
 	static hasMarker(error, marker15) {
 		const markerSymbol = Symbol.for(marker15);
 		return error != null && typeof error === "object" && markerSymbol in error && typeof error[markerSymbol] === "boolean" && error[markerSymbol] === true;
 	}
 };
-var name$1$16 = "AI_APICallError";
-var marker2$5 = `vercel.ai.error.${name$1$16}`;
+var name$1$15 = "AI_APICallError";
+var marker2$5 = `vercel.ai.error.${name$1$15}`;
 var symbol2$5 = Symbol.for(marker2$5);
 var _a2$5;
 var _b2$3;
 var APICallError$2 = class extends (_b2$3 = AISDKError$2, _a2$5 = symbol2$5, _b2$3) {
 	constructor({ message, url, requestBodyValues, statusCode, responseHeaders, responseBody, cause, isRetryable = statusCode != null && (statusCode === 408 || statusCode === 409 || statusCode === 429 || statusCode >= 500), data }) {
 		super({
-			name: name$1$16,
+			name: name$1$15,
 			message,
 			cause
 		});
@@ -12693,15 +12693,15 @@ function createAbortError$2() {
 function extractResponseHeaders$2(response) {
 	return Object.fromEntries([...response.headers]);
 }
-var name$21 = "AI_DownloadError";
-var marker$15 = `vercel.ai.error.${name$21}`;
-var symbol$24 = Symbol.for(marker$15);
+var name$15 = "AI_DownloadError";
+var marker$20 = `vercel.ai.error.${name$15}`;
+var symbol$24 = Symbol.for(marker$20);
 var _a$5;
 var _b$5;
 var DownloadError$2 = class extends (_b$5 = AISDKError$2, _a$5 = symbol$24, _b$5) {
 	constructor({ url, statusCode, statusText, cause, message = cause == null ? `Failed to download ${url}: ${statusCode} ${statusText}` : `Failed to download ${url}: ${cause}` }) {
 		super({
-			name: name$21,
+			name: name$15,
 			message,
 			cause
 		});
@@ -12711,7 +12711,7 @@ var DownloadError$2 = class extends (_b$5 = AISDKError$2, _a$5 = symbol$24, _b$5
 		this.statusText = statusText;
 	}
 	static isInstance(error) {
-		return AISDKError$2.hasMarker(error, marker$15);
+		return AISDKError$2.hasMarker(error, marker$20);
 	}
 };
 var EMBEDDING_MODEL_MAX_INPUT_BYTES_PER_CALL$2 = /* @__PURE__ */ Symbol.for("vercel.ai.embeddingModel.maxInputBytesPerCall");
@@ -12874,7 +12874,7 @@ function withUserAgentSuffix$2(headers, ...userAgentSuffixParts) {
 	normalizedHeaders.set("user-agent", [currentUserAgentHeader, ...userAgentSuffixParts].filter(Boolean).join(" "));
 	return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION$8 = "3.0.42";
+var VERSION$8 = "3.0.43";
 var getOriginalFetch$3 = () => globalThis.fetch;
 var getFromApi$2 = async ({ url, headers = {}, successfulResponseHandler, failedResponseHandler, abortSignal, fetch = getOriginalFetch$3() }) => {
 	try {
@@ -14308,10 +14308,10 @@ async function getVercelOidcToken$2() {
 	if (process.env.VERCEL_OIDC_TOKEN) return process.env.VERCEL_OIDC_TOKEN ?? "";
 	throw new Error("@vercel/oidc is not available in the vendored @internal AI packages. Provide an API key instead.");
 }
-var symbol$22 = Symbol.for("vercel.ai.gateway.error");
+var symbol$15 = Symbol.for("vercel.ai.gateway.error");
 var _a$4;
 var _b$3;
-var GatewayError$2 = class _GatewayError extends (_b$3 = Error, _a$4 = symbol$22, _b$3) {
+var GatewayError$2 = class _GatewayError extends (_b$3 = Error, _a$4 = symbol$15, _b$3) {
 	constructor({ message, statusCode = 500, cause, isRetryable = statusCode != null && (statusCode === 408 || statusCode === 409 || statusCode === 429 || statusCode >= 500) }) {
 		super(message);
 		this[_a$4] = true;
@@ -14328,7 +14328,7 @@ var GatewayError$2 = class _GatewayError extends (_b$3 = Error, _a$4 = symbol$22
 		return _GatewayError.hasMarker(error);
 	}
 	static hasMarker(error) {
-		return typeof error === "object" && error !== null && symbol$22 in error && error[symbol$22] === true;
+		return typeof error === "object" && error !== null && symbol$15 in error && error[symbol$15] === true;
 	}
 };
 var name$10 = "GatewayAuthenticationError";
@@ -15279,7 +15279,7 @@ async function getVercelRequestId$2() {
 	var _a10;
 	return (_a10 = getContext$2().headers) == null ? void 0 : _a10["x-vercel-id"];
 }
-var VERSION$7 = "2.0.173";
+var VERSION$7 = "2.0.174";
 var AI_GATEWAY_PROTOCOL_VERSION$2 = "0.0.1";
 function createGatewayProvider$1(options = {}) {
 	var _a10, _b10;
@@ -16313,7 +16313,7 @@ function getGlobalProvider$2() {
 	var _a17;
 	return (_a17 = globalThis.AI_SDK_DEFAULT_PROVIDER) != null ? _a17 : gateway$2;
 }
-var VERSION$6 = "5.0.282";
+var VERSION$6 = "5.0.283";
 var dataContentSchema$1 = zod_v4.z.union([
 	zod_v4.z.string(),
 	zod_v4.z.instanceof(Uint8Array),
@@ -17219,11 +17219,11 @@ var object$2 = ({ schema: inputSchema }) => {
 		}
 	};
 };
-var marker$1$15 = "vercel.ai.error";
-var symbol$1$16 = Symbol.for(marker$1$15);
+var marker$1$14 = "vercel.ai.error";
+var symbol$1$15 = Symbol.for(marker$1$14);
 var _a$1$1;
 var _b$1$1;
-var AISDKError$1 = class _AISDKError extends (_b$1$1 = Error, _a$1$1 = symbol$1$16, _b$1$1) {
+var AISDKError$1 = class _AISDKError extends (_b$1$1 = Error, _a$1$1 = symbol$1$15, _b$1$1) {
 	/**
 	* Creates an AI SDK Error.
 	*
@@ -17244,22 +17244,22 @@ var AISDKError$1 = class _AISDKError extends (_b$1$1 = Error, _a$1$1 = symbol$1$
 	* @returns {boolean} True if the error is an AI SDK Error, false otherwise.
 	*/
 	static isInstance(error) {
-		return _AISDKError.hasMarker(error, marker$1$15);
+		return _AISDKError.hasMarker(error, marker$1$14);
 	}
 	static hasMarker(error, marker15) {
 		const markerSymbol = Symbol.for(marker15);
 		return error != null && typeof error === "object" && markerSymbol in error && typeof error[markerSymbol] === "boolean" && error[markerSymbol] === true;
 	}
 };
-var name$1$15 = "AI_APICallError";
-var marker2$2 = `vercel.ai.error.${name$1$15}`;
+var name$1$14 = "AI_APICallError";
+var marker2$2 = `vercel.ai.error.${name$1$14}`;
 var symbol2$2 = Symbol.for(marker2$2);
 var _a2$2;
 var _b2$1;
 var APICallError$1 = class extends (_b2$1 = AISDKError$1, _a2$2 = symbol2$2, _b2$1) {
 	constructor({ message, url, requestBodyValues, statusCode, responseHeaders, responseBody, cause, isRetryable = statusCode != null && (statusCode === 408 || statusCode === 409 || statusCode === 429 || statusCode >= 500), data }) {
 		super({
-			name: name$1$15,
+			name: name$1$14,
 			message,
 			cause
 		});
@@ -17615,6 +17615,8 @@ function extractResponseHeaders$1(response) {
 }
 var { btoa: btoa$2, atob: atob$4 } = globalThis;
 function convertUint8ArrayToBase64$1(array) {
+	var _a2;
+	if (typeof ((_a2 = globalThis.Buffer) == null ? void 0 : _a2.from) === "function") return globalThis.Buffer.from(array.buffer, array.byteOffset, array.byteLength).toString("base64");
 	const chunks = [];
 	const chunkSize = 4096;
 	for (let i = 0; i < array.length; i += chunkSize) chunks.push(String.fromCodePoint(...array.subarray(i, i + chunkSize)));
@@ -17627,11 +17629,11 @@ async function cancelResponseBody$1(response) {
 	} catch (e) {}
 }
 var name$19 = "AI_DownloadError";
-var marker$12 = `vercel.ai.error.${name$19}`;
-var symbol$20 = Symbol.for(marker$12);
+var marker$15 = `vercel.ai.error.${name$19}`;
+var symbol$21 = Symbol.for(marker$15);
 var _a$2;
 var _b$2;
-var DownloadError$1 = class extends (_b$2 = AISDKError$1, _a$2 = symbol$20, _b$2) {
+var DownloadError$1 = class extends (_b$2 = AISDKError$1, _a$2 = symbol$21, _b$2) {
 	constructor({ url, statusCode, statusText, cause, message = cause == null ? `Failed to download ${url}: ${statusCode} ${statusText}` : `Failed to download ${url}: ${cause}` }) {
 		super({
 			name: name$19,
@@ -17644,7 +17646,7 @@ var DownloadError$1 = class extends (_b$2 = AISDKError$1, _a$2 = symbol$20, _b$2
 		this.statusText = statusText;
 	}
 	static isInstance(error) {
-		return AISDKError$1.hasMarker(error, marker$12);
+		return AISDKError$1.hasMarker(error, marker$15);
 	}
 };
 function isBrowserRuntime$1(globalThisAny = globalThis) {
@@ -18074,7 +18076,7 @@ function withUserAgentSuffix$1(headers, ...userAgentSuffixParts) {
 	normalizedHeaders.set("user-agent", [currentUserAgentHeader, ...userAgentSuffixParts].filter(Boolean).join(" "));
 	return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION$5 = "4.0.62";
+var VERSION$5 = "4.0.63";
 var getOriginalFetch$1 = () => globalThis.fetch;
 var getFromApi$1 = async ({ url, headers = {}, successfulResponseHandler, failedResponseHandler, abortSignal, fetch, validateUrl, credentialedOrigin, trustedOrigin }) => {
 	try {
@@ -19557,10 +19559,10 @@ async function getVercelOidcToken$1() {
 	if (process.env.VERCEL_OIDC_TOKEN) return process.env.VERCEL_OIDC_TOKEN ?? "";
 	throw new Error("@vercel/oidc is not available in the vendored @internal AI packages. Provide an API key instead.");
 }
-var symbol$15 = Symbol.for("vercel.ai.gateway.error");
+var symbol$20 = Symbol.for("vercel.ai.gateway.error");
 var _a$1$3;
 var _b;
-var GatewayError$1 = class _GatewayError extends (_b = Error, _a$1$3 = symbol$15, _b) {
+var GatewayError$1 = class _GatewayError extends (_b = Error, _a$1$3 = symbol$20, _b) {
 	constructor({ message, statusCode = 500, cause, generationId, isRetryable = statusCode != null && (statusCode === 408 || statusCode === 409 || statusCode === 429 || statusCode >= 500) }) {
 		super(generationId ? `${message} [${generationId}]` : message);
 		this[_a$1$3] = true;
@@ -19578,7 +19580,7 @@ var GatewayError$1 = class _GatewayError extends (_b = Error, _a$1$3 = symbol$15
 		return _GatewayError.hasMarker(error);
 	}
 	static hasMarker(error) {
-		return typeof error === "object" && error !== null && symbol$15 in error && error[symbol$15] === true;
+		return typeof error === "object" && error !== null && symbol$20 in error && error[symbol$20] === true;
 	}
 };
 var name$18 = "GatewayAuthenticationError";
@@ -21469,7 +21471,7 @@ async function getVercelRequestId$1() {
 	var _a11;
 	return (_a11 = getContext$1().headers) == null ? void 0 : _a11["x-vercel-id"];
 }
-var VERSION$4 = "3.0.223";
+var VERSION$4 = "3.0.226";
 var AI_GATEWAY_PROTOCOL_VERSION$1 = "0.0.1";
 function createGatewayProvider(options = {}) {
 	var _a11, _b11;
@@ -22491,8 +22493,8 @@ var __export$3 = (target, all) => {
 	});
 };
 var name$12 = "AI_InvalidArgumentError";
-var marker$19 = `vercel.ai.error.${name$12}`;
-var symbol$19 = Symbol.for(marker$19);
+var marker$12 = `vercel.ai.error.${name$12}`;
+var symbol$19 = Symbol.for(marker$12);
 var _a;
 var InvalidArgumentError$2 = class extends AISDKError$1 {
 	constructor({ parameter, value, message }) {
@@ -22505,7 +22507,7 @@ var InvalidArgumentError$2 = class extends AISDKError$1 {
 		this.value = value;
 	}
 	static isInstance(error) {
-		return AISDKError$1.hasMarker(error, marker$19);
+		return AISDKError$1.hasMarker(error, marker$12);
 	}
 };
 _a = symbol$19;
@@ -22644,7 +22646,7 @@ function getTotalTimeoutMs(timeout) {
 	if (typeof timeout === "number") return timeout;
 	return timeout.totalMs;
 }
-var VERSION$3 = "6.0.317";
+var VERSION$3 = "6.0.320";
 var dataContentSchema$3 = zod_v4.z.union([
 	zod_v4.z.string(),
 	zod_v4.z.instanceof(Uint8Array),
@@ -23979,6 +23981,21 @@ var JSONParseError$4 = class extends AISDKError$4 {
 		return AISDKError$4.hasMarker(error, marker$8$1);
 	}
 };
+const name$7$1 = "AI_LoadAPIKeyError";
+const marker$7$1 = `vercel.ai.error.${name$7$1}`;
+const symbol$7$1 = Symbol.for(marker$7$1);
+var LoadAPIKeyError = class extends AISDKError$4 {
+	constructor({ message }) {
+		super({
+			name: name$7$1,
+			message
+		});
+		this[symbol$7$1] = true;
+	}
+	static isInstance(error) {
+		return AISDKError$4.hasMarker(error, marker$7$1);
+	}
+};
 const name$1$1$1 = "AI_TypeValidationError";
 const marker$1$1$1 = `vercel.ai.error.${name$1$1$1}`;
 const symbol$1$1$1 = Symbol.for(marker$1$1$1);
@@ -24509,7 +24526,7 @@ function handleFetchError({ error, url, requestBodyValues }) {
 	}
 	return error;
 }
-const VERSION$2 = "5.0.70";
+const VERSION$2 = "5.0.72";
 /**
 * Normalizes different header inputs into a plain record with lower-case keys.
 * Entries with `undefined` or `null` values are removed.
@@ -27553,6 +27570,7 @@ function isTimeoutError(error) {
 	return false;
 }
 async function asGatewayError(error, authMethod) {
+	if ((error instanceof Error || typeof DOMException === "function" && error instanceof DOMException) && (error.name === "AbortError" || error.name === "TimeoutError")) throw error;
 	if (GatewayError.isInstance(error)) return error;
 	if (isTimeoutError(error)) return GatewayTimeoutError.createTimeoutError({
 		originalMessage: error instanceof Error ? error.message : "Unknown error",
@@ -29002,7 +29020,7 @@ const gatewayRerankingResponseSchema = lazySchema(() => zodSchema$4(z$3.object({
 * synchronous, hence this helper.
 */
 async function errorControllerWithGatewayError(controller, error, authMethod) {
-	controller.error(await asGatewayError(error, authMethod));
+	controller.error(await asGatewayError(error, authMethod).catch((error) => error));
 }
 /**
 * Extract a human-readable message from an `error` stream part's payload for
@@ -30175,7 +30193,7 @@ const gatewayTools = {
 async function getVercelRequestId() {
 	return getContext().headers?.["x-vercel-id"];
 }
-const VERSION$1$3 = "4.0.128";
+const VERSION$1$3 = "4.0.132";
 const AI_GATEWAY_PROTOCOL_VERSION = "0.0.1";
 /** Response shape of `POST /v1/realtime/client-secrets`. `expiresAt` is epoch seconds. */
 const gatewayClientSecretResponseSchema = lazySchema(() => zodSchema$4(z$3.object({
@@ -30198,9 +30216,11 @@ function createGateway(options = {}) {
 		...options.teamIdOrSlug != null ? { [VERCEL_AI_GATEWAY_TEAM_HEADER]: options.teamIdOrSlug } : {},
 		...options.headers
 	}, `ai-sdk-gateway/${VERSION$1$3}`);
-	const getHeaders = async () => {
+	const getHeaders = async (onResolved) => {
 		try {
-			return createAuthHeaders(await getGatewayAuthToken(options));
+			const headers = createAuthHeaders(await getGatewayAuthToken(options));
+			onResolved?.(headers);
+			return headers;
 		} catch (error) {
 			throw GatewayAuthenticationError.createContextualError({
 				apiKeyProvided: false,
@@ -30300,44 +30320,56 @@ function createGateway(options = {}) {
 		const now = options._internal?.currentDate?.().getTime() ?? Date.now();
 		if (!pendingMetadata || now - lastFetchTime > cacheRefreshMillis) {
 			lastFetchTime = now;
+			let resolvedHeaders;
 			pendingMetadata = new GatewayFetchMetadata({
 				baseURL,
-				headers: getHeaders,
+				headers: () => getHeaders((headers) => {
+					resolvedHeaders = headers;
+				}),
 				fetch: options.fetch
 			}).getAvailableModels().then((metadata) => {
 				metadataCache = metadata;
 				return metadata;
 			}).catch(async (error) => {
-				throw await asGatewayError(error, await parseAuthMethod(await getHeaders()));
+				throw await asGatewayError(error, await parseAuthMethod(resolvedHeaders ?? {}));
 			});
 		}
 		return metadataCache ? Promise.resolve(metadataCache) : pendingMetadata;
 	};
 	const getCredits = async () => {
+		let resolvedHeaders;
 		return new GatewayFetchMetadata({
 			baseURL,
-			headers: getHeaders,
+			headers: () => getHeaders((headers) => {
+				resolvedHeaders = headers;
+			}),
 			fetch: options.fetch
 		}).getCredits().catch(async (error) => {
-			throw await asGatewayError(error, await parseAuthMethod(await getHeaders()));
+			throw await asGatewayError(error, await parseAuthMethod(resolvedHeaders ?? {}));
 		});
 	};
 	const getSpendReport = async (params) => {
+		let resolvedHeaders;
 		return new GatewaySpendReport({
 			baseURL,
-			headers: getHeaders,
+			headers: () => getHeaders((headers) => {
+				resolvedHeaders = headers;
+			}),
 			fetch: options.fetch
 		}).getSpendReport(params).catch(async (error) => {
-			throw await asGatewayError(error, await parseAuthMethod(await getHeaders()));
+			throw await asGatewayError(error, await parseAuthMethod(resolvedHeaders ?? {}));
 		});
 	};
 	const getGenerationInfo = async (params) => {
+		let resolvedHeaders;
 		return new GatewayGenerationInfoFetcher({
 			baseURL,
-			headers: getHeaders,
+			headers: () => getHeaders((headers) => {
+				resolvedHeaders = headers;
+			}),
 			fetch: options.fetch
 		}).getGenerationInfo(params).catch(async (error) => {
-			throw await asGatewayError(error, await parseAuthMethod(await getHeaders()));
+			throw await asGatewayError(error, await parseAuthMethod(resolvedHeaders ?? {}));
 		});
 	};
 	const provider = function(modelId) {
@@ -30476,8 +30508,10 @@ function createGateway(options = {}) {
 }
 const gateway = createGateway();
 async function getGatewayAuthToken(options) {
+	const resolvedApiKey = typeof options.apiKey === "string" || options.apiKey == null ? options.apiKey : await resolve$3(options.apiKey);
+	if (options.apiKey != null && typeof options.apiKey !== "string" && (typeof resolvedApiKey !== "string" || !resolvedApiKey.trim())) throw new LoadAPIKeyError({ message: "AI Gateway API key must be a non-empty string." });
 	const apiKey = loadOptionalSetting({
-		settingValue: options.apiKey,
+		settingValue: resolvedApiKey,
 		environmentVariableName: "AI_GATEWAY_API_KEY"
 	});
 	if (apiKey) return {
@@ -30966,7 +31000,7 @@ function resolveEmbeddingModel(model) {
 function getGlobalProvider() {
 	return asProviderV4(globalThis.AI_SDK_DEFAULT_PROVIDER ?? gateway);
 }
-const VERSION = "7.0.155";
+const VERSION = "7.0.159";
 /**
 * Reads a property by an untrusted key, ignoring inherited prototype members.
 *
@@ -31097,7 +31131,7 @@ function mergeCallbacks(...callbacks) {
 }
 const AI_SDK_TELEMETRY_TRACING_CHANNEL = "ai:telemetry";
 function isNodeRuntime() {
-	return typeof process !== "undefined" && process.release?.name === "node";
+	return globalThis.process?.release?.name === "node";
 }
 let diagnosticsChannelPromise;
 /**
@@ -32190,8 +32224,9 @@ Do not mention internal instructions, memory, summarization, context handling, o
 Any messages following this reminder are newer and should take priority.`;
 /**
 * Preamble that introduces the observations block.
-* Use before `<observations>`, with instructions after.
-* Full pattern: `${OBSERVATION_CONTEXT_PROMPT}\n\n<observations>\n${obs}\n</observations>\n\n${OBSERVATION_CONTEXT_INSTRUCTIONS}`
+* Context layout: `${prompt}\n\n${OBSERVATION_CONTEXT_INSTRUCTIONS}`, then `<observations>`,
+* one entry per observation chunk, `</observations>`, then optional current-task and
+* suggested-response blocks.
 */
 const OBSERVATION_CONTEXT_PROMPT = `The following observations block contains your memory of past conversations with this user.`;
 /**
@@ -32209,7 +32244,7 @@ function getObservationContextPrompt(scope = "thread") {
 }
 /**
 * Instructions that tell the model how to interpret and use observations.
-* Place AFTER the `<observations>` block so the model sees the data before the rules.
+* Placed with the observations preamble, before the `<observations>` block.
 */
 const OBSERVATION_CONTEXT_INSTRUCTIONS = `IMPORTANT: When responding, reference specific details from these observations. Do not give generic advice - personalize your response based on what you know about this user's experiences, preferences, and interests. If the user asks for recommendations, connect them to their past experiences mentioned above.
 
@@ -36688,7 +36723,7 @@ async function resolveImageDimensionsAsync(part) {
 	const url = resolveHttpAssetUrl(getObjectValue(part, "image") ?? getObjectValue(part, "data"));
 	if (!url) return existing;
 	try {
-		const probeImageSize = (await Promise.resolve().then(() => /* @__PURE__ */ require_rolldown_runtime.__toESM(require("./probe-image-size-CSrQj2gm.cjs").default, 1))).default;
+		const probeImageSize = (await Promise.resolve().then(() => /* @__PURE__ */ require_rolldown_runtime.__toESM(require("./probe-image-size-BAwk1h6w.cjs").default, 1))).default;
 		const probed = await probeImageSize(url, {
 			open_timeout: REMOTE_IMAGE_PROBE_TIMEOUT_MS,
 			response_timeout: REMOTE_IMAGE_PROBE_TIMEOUT_MS,
@@ -38949,12 +38984,34 @@ function getMessageParts(msg) {
 	const parts = msg.content?.parts;
 	return Array.isArray(parts) ? parts : [];
 }
-/** Returns true if a message has at least one non-data part with visible content. */
+/**
+* Returns true if recall can render at least one visible part of a message.
+* Mirrors the skip rules in `formatMessageParts` without formatting tool results.
+*/
 function hasVisibleParts(msg) {
-	if (typeof msg.content === "string") return msg.content.length > 0;
+	if (typeof msg.content === "string") return true;
 	const parts = getMessageParts(msg);
 	if (parts.length === 0) return Boolean(msg.content?.content);
-	return parts.some((p) => !p.type?.startsWith("data-"));
+	return parts.some(isVisiblePart);
+}
+function isVisiblePart(part) {
+	const partType = part?.type;
+	switch (partType) {
+		case void 0:
+		case "":
+		case "reasoning":
+		case "redacted-reasoning":
+		case "step-start": return false;
+		case "text": return Boolean(part.text);
+		case "tool-invocation": {
+			const inv = part.toolInvocation;
+			if (!inv?.toolName) return false;
+			return inv.state !== "partial-call" && inv.args != null || inv.state === "result";
+		}
+		case "tool-call":
+		case "tool-result": return Boolean(part.toolName);
+		default: return !partType.startsWith("data-");
+	}
 }
 function parseRangeFormat(cursor) {
 	if (cursor.includes(",")) {
@@ -39068,7 +39125,7 @@ async function listThreadsForResource({ memory, resourceId, currentThreadId, pag
 		hasMore
 	};
 }
-const SEARCH_NOT_CONFIGURED_MESSAGE = "Search is not configured. Enable it with `retrieval: { vector: true }` and configure a vector store and embedder on your Memory instance.";
+const SEARCH_NOT_CONFIGURED_MESSAGE = "Search is not configured. Enable it with `retrieval: { vector: true }` and configure a vector store and an embedder, or a vector store that generates embeddings itself, on your Memory instance.";
 async function searchMessagesForResource({ memory, om, resourceId, currentThreadId, query, topK = 10, maxTokens = DEFAULT_MAX_RESULT_TOKENS, before, after, threadScope, includeThreadId = true, currentMessages = [] }) {
 	if (!memory.searchMessages) return {
 		results: SEARCH_NOT_CONFIGURED_MESSAGE,
@@ -39586,11 +39643,8 @@ function formatMessageParts(msg, detail) {
 				const fullText = `[Tool Result: ${toolName}]\n${formatToolResultForObserver(omitInlineMediaPayloads(part.output ?? part.result), { maxTokens: HIGH_DETAIL_TOOL_RESULT_TOKENS })}`;
 				parts.push(makePart(msg, i, "tool-result", fullText, detail, toolName));
 			}
-		} else if (partType === "reasoning") {
-			const reasoning = part.reasoning ?? part.text;
-			if (reasoning) parts.push(makePart(msg, i, "reasoning", reasoning, detail));
-		} else if (partType === "image" || partType === "file") parts.push(makePart(msg, i, partType, formatAttachmentPart(partType, part), detail));
-		else if (partType?.startsWith("data-")) {} else if (partType) {
+		} else if (partType === "reasoning" || partType === "redacted-reasoning") {} else if (partType === "image" || partType === "file") parts.push(makePart(msg, i, partType, formatAttachmentPart(partType, part), detail));
+		else if (partType === "step-start" || partType?.startsWith("data-")) {} else if (partType) {
 			const fullText = `[${partType}]`;
 			parts.push({
 				messageId: msg.id,
@@ -39621,12 +39675,29 @@ function buildRenderedText(parts, timestamps) {
 	}
 	return lines.join("\n");
 }
+/**
+* Reads messages until `needed` of them are visible or storage is exhausted, growing the
+* request each round. Hidden messages (reasoning-only, step boundaries, OM markers) don't
+* count toward `needed`, so a run of them can't end paging early.
+*/
+async function recallVisibleMessages(memory, args, needed, perPage = needed) {
+	let previousCount = -1;
+	while (true) {
+		const result = await memory.recall({
+			...args,
+			page: 0,
+			perPage
+		});
+		const visible = result.messages.filter(hasVisibleParts);
+		if (visible.length >= needed || !result.hasMore || result.messages.length <= previousCount) return visible;
+		previousCount = result.messages.length;
+		perPage *= 2;
+	}
+}
 async function getNextVisibleMessage({ memory, threadId, resourceId, after }) {
-	return (await memory.recall({
+	return (await recallVisibleMessages(memory, {
 		threadId,
 		resourceId,
-		page: 0,
-		perPage: 50,
 		orderBy: {
 			field: "createdAt",
 			direction: "ASC"
@@ -39635,7 +39706,7 @@ async function getNextVisibleMessage({ memory, threadId, resourceId, after }) {
 			start: after,
 			startExclusive: true
 		} }
-	})).messages.find(hasVisibleParts) ?? null;
+	}, 1, 50))[0] ?? null;
 }
 const MAX_EXPAND_USER_TEXT_TOKENS = 200;
 const MAX_EXPAND_OTHER_TOKENS = 50;
@@ -39645,7 +39716,7 @@ function expandLimit(part) {
 }
 function expandPriority(part) {
 	if (part.role === "user" && part.type === "text") return 0;
-	if (part.type === "text" || part.type === "reasoning") return 1;
+	if (part.type === "text") return 1;
 	if (part.type === "tool-result") return 2;
 	if (part.type === "tool-call") return 3;
 	return 4;
@@ -39831,11 +39902,9 @@ async function recallMessages({ memory, threadId, resourceId, cursor, page = 1,
 	const pageIndex = Math.max(Math.abs(normalizedPage), 1) - 1;
 	const skip = pageIndex * normalizedLimit;
 	const fetchCount = skip + normalizedLimit + 1;
-	const visibleMessages = (await memory.recall({
+	const visibleMessages = await recallVisibleMessages(memory, {
 		threadId: resolvedThreadId,
 		resourceId,
-		page: 0,
-		perPage: fetchCount,
 		orderBy: {
 			field: "createdAt",
 			direction: isForward ? "ASC" : "DESC"
@@ -39847,7 +39916,7 @@ async function recallMessages({ memory, threadId, resourceId, cursor, page = 1,
 			end: anchor.createdAt,
 			endExclusive: true
 		} }
-	})).messages.filter(hasVisibleParts);
+	}, fetchCount);
 	const total = visibleMessages.length;
 	const hasMore = total > skip + normalizedLimit;
 	let messages;
@@ -39930,17 +39999,15 @@ async function recallThreadFromStart({ memory, threadId, resourceId, page = 1, l
 	const normalizedLimit = Math.min(Math.max(limit, 1), MAX_LIMIT);
 	const pageIndex = normalizedPage - 1;
 	const fetchCount = pageIndex * normalizedLimit + normalizedLimit + 1;
-	const result = await memory.recall({
+	const fetched = await recallVisibleMessages(memory, {
 		threadId,
 		resourceId,
-		page: 0,
-		perPage: fetchCount,
 		orderBy: {
 			field: "createdAt",
 			direction: anchor === "end" ? "DESC" : "ASC"
 		}
-	});
-	const visibleMessages = anchor === "end" ? result.messages.slice(0, fetchCount).filter(hasVisibleParts).reverse() : result.messages.slice(0, fetchCount).filter(hasVisibleParts);
+	}, fetchCount);
+	const visibleMessages = anchor === "end" ? fetched.reverse() : fetched;
 	const skip = pageIndex * normalizedLimit;
 	const messages = visibleMessages.slice(skip, skip + normalizedLimit);
 	const hasExtraMessage = visibleMessages.length > skip + messages.length;
@@ -40075,7 +40142,6 @@ const recallTool = (_memoryConfig, options) => {
 						"text",
 						"tool-call",
 						"tool-result",
-						"reasoning",
 						"image",
 						"file"
 					],
@@ -46243,7 +46309,7 @@ var ObservationalMemory = class ObservationalMemory {
 		const messages = [`${getObservationContextPrompt(this.scope)}\n\n${OBSERVATION_CONTEXT_INSTRUCTIONS}${retrieval ? `\n\n${getRetrievalInstructions(this.retrievalScope, this.retrievalInstructions, this.retrievalSearch, this.storage.supportsObservationalMemoryHistorySearch === true)}` : ""}`];
 		if (unobservedContextBlocks) messages.push(`The following content is from OTHER conversations different from the current conversation, they're here for reference,  but they're not necessarily your focus:\nSTART_OTHER_CONVERSATIONS_BLOCK\n${unobservedContextBlocks}\nEND_OTHER_CONVERSATIONS_BLOCK`);
 		const observationChunks = this.splitObservationContextChunks(optimized);
-		if (observationChunks.length > 0) messages.push("<observations>", ...observationChunks);
+		if (observationChunks.length > 0) messages.push("<observations>", ...observationChunks, "</observations>");
 		if (currentTask) messages.push(`<current-task>\n${currentTask}\n</current-task>`);
 		if (suggestedResponse) messages.push(`<suggested-response>\n${suggestedResponse}\n</suggested-response>`);
 		messages.push(...buildExtractedValueContextSections([...this.observationConfig.extractors, ...this.reflectionConfig.extractors], extractedValues));
@@ -48682,7 +48748,7 @@ var Memory = class Memory extends _mastra_core_memory.MastraMemory {
 		const omConfig = normalizeObservationalMemoryConfig(mergedConfig.observationalMemory);
 		if (omConfig?.retrieval && typeof omConfig.retrieval === "object" && omConfig.retrieval.vector) {
 			if (!this.vector) throw new Error("`retrieval: { vector: true }` requires a vector store. Pass a `vector` option to your Memory instance.");
-			if (!this.embedder) throw new Error("`retrieval: { vector: true }` requires an embedder. Pass an `embedder` option to your Memory instance.");
+			if (!this.embedder && !this.isSelfEmbedding) throw new Error("`retrieval: { vector: true }` requires an embedder, or a vector store that generates embeddings itself. Pass an `embedder` option to your Memory instance.");
 		}
 	}
 	/**
@@ -49864,8 +49930,9 @@ Notes:
 		if (config?.workingMemory?.useStateSignals === true && this.isVNextWorkingMemoryConfig(config)) throw new Error("workingMemory.useStateSignals is not supported with workingMemory.version: 'vnext'. Use stable template working memory or disable useStateSignals.");
 	}
 	getObservationEmbeddingIndexName(dimensions) {
-		const usedDimensions = dimensions ?? 384;
 		const separator = this.vector?.indexSeparator ?? "_";
+		if (this.isSelfEmbedding) return `${this.observationIndexPrefix}${separator}selfembed`;
+		const usedDimensions = dimensions ?? 384;
 		return `${this.observationIndexPrefix}${separator}${usedDimensions}`;
 	}
 	async createObservationEmbeddingIndex(dimensions) {
@@ -49874,7 +49941,7 @@ Notes:
 		if (typeof this.vector === `undefined`) throw new Error(`Tried to create observation embedding index but no vector db is attached to this Memory instance.`);
 		await this.vector.createIndex({
 			indexName,
-			dimension: usedDimensions,
+			...this.isSelfEmbedding ? {} : { dimension: usedDimensions },
 			metadataIndexes: ["resource_id", "thread_id"]
 		});
 		return { indexName };
@@ -49885,7 +49952,14 @@ Notes:
 	*/
 	async searchMessages({ query, resourceId, topK = 10, filter }) {
 		if (!this.vector) throw new Error("searchMessages requires a vector store. Configure vector and embedder on your Memory instance.");
-		const { embeddings, dimension } = await this.embedMessageContent(query);
+		const queries = [];
+		let dimension;
+		if (this.isSelfEmbedding) queries.push({ queryText: query });
+		else {
+			const embedResult = await this.embedMessageContent(query);
+			dimension = embedResult.dimension;
+			queries.push(...embedResult.embeddings.map((queryVector) => ({ queryVector })));
+		}
 		const { indexName } = await this.createObservationEmbeddingIndex(dimension);
 		const vectorFilter = { resource_id: resourceId };
 		if (filter?.threadId) vectorFilter.thread_id = filter.threadId;
@@ -49894,10 +49968,10 @@ Notes:
 			...filter.observedBefore ? { $lt: filter.observedBefore.toISOString() } : {}
 		};
 		const queryResults = [];
-		await Promise.all(embeddings.map(async (embedding) => {
+		await Promise.all(queries.map(async (params) => {
 			const results = await this.vector.query({
 				indexName,
-				queryVector: embedding,
+				...params,
 				topK,
 				filter: vectorFilter
 			});
@@ -49928,12 +50002,21 @@ Notes:
 	* Index a single observation group into the observation vector store.
 	*/
 	async indexObservation({ text, groupId, range, threadId, resourceId, observedAt, recordId }) {
-		if (!this.vector || !this.embedder) return;
-		const embedResult = await this.embedMessageContent(text);
-		if (embedResult.embeddings.length === 0 || embedResult.dimension === void 0) return;
-		const { indexName } = await this.createObservationEmbeddingIndex(embedResult.dimension);
+		if (!this.vector || !this.embedder && !this.isSelfEmbedding) return;
+		let chunks;
+		let embeddings = [];
+		let dimension;
+		if (this.isSelfEmbedding) {
+			chunks = this.chunkText(text);
+			if (chunks.length === 0) return;
+		} else {
+			const embedResult = await this.embedMessageContent(text);
+			({chunks, embeddings, dimension} = embedResult);
+			if (embeddings.length === 0 || dimension === void 0) return;
+		}
+		const { indexName } = await this.createObservationEmbeddingIndex(dimension);
 		const ids = [];
-		for (const [chunkIndex] of embedResult.chunks.entries()) {
+		for (const [chunkIndex] of chunks.entries()) {
 			const hash = Buffer.from(await globalThis.crypto.subtle.digest("SHA-256", new TextEncoder().encode(JSON.stringify([
 				resourceId,
 				threadId,
@@ -49945,19 +50028,26 @@ Notes:
 			const hex = hash.toString("hex", 0, 16);
 			ids.push(`${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`);
 		}
-		await this.vector.upsert({
+		const metadata = chunks.map((chunk) => ({
+			group_id: groupId,
+			range,
+			thread_id: threadId,
+			resource_id: resourceId,
+			observed_at: observedAt?.toISOString(),
+			...recordId ? { record_id: recordId } : {},
+			text: chunk
+		}));
+		if (this.isSelfEmbedding) await this.vector.upsert({
 			indexName,
 			ids,
-			vectors: embedResult.embeddings,
-			metadata: embedResult.chunks.map((chunk) => ({
-				group_id: groupId,
-				range,
-				thread_id: threadId,
-				resource_id: resourceId,
-				observed_at: observedAt?.toISOString(),
-				...recordId ? { record_id: recordId } : {},
-				text: chunk
-			}))
+			documents: chunks,
+			metadata
+		});
+		else await this.vector.upsert({
+			indexName,
+			ids,
+			vectors: embeddings,
+			metadata
 		});
 	}
 	/**
@@ -50114,11 +50204,12 @@ Notes:
 	}
 	/**
 	* Check whether retrieval search (vector-based) is enabled.
-	* Returns true when `retrieval: { vector: true }` and Memory has vector + embedder configured.
+	* Returns true when `retrieval: { vector: true }` and Memory has a vector store plus either an
+	* embedder or a store that generates embeddings itself.
 	*/
 	hasRetrievalSearch(retrieval) {
 		if (!retrieval || retrieval === true) return false;
-		return !!retrieval.vector && !!this.vector && !!this.embedder;
+		return !!retrieval.vector && !!this.vector && (!!this.embedder || this.isSelfEmbedding);
 	}
 	listTools(config) {
 		const mergedConfig = this.getMergedThreadConfig(config);
@@ -50599,15 +50690,22 @@ Notes:
 		const vector = this.vector;
 		const indexes = await this.getMemoryVectorIndexes([this.observationIndexPrefix]);
 		for (const indexName of indexes) {
-			const { dimension } = await vector.describeIndex({ indexName });
-			const queryVector = Array.from({ length: dimension }, (_, i) => i === 0 ? 1 : 0);
+			const selfEmbedded = this.isSelfEmbedding && indexName === this.getObservationEmbeddingIndexName();
+			let readParams;
+			if (selfEmbedded) readParams = { queryText: "observations" };
+			else {
+				const { dimension } = await vector.describeIndex({ indexName });
+				readParams = {
+					queryVector: Array.from({ length: dimension }, (_, i) => i === 0 ? 1 : 0),
+					includeVector: true
+				};
+			}
 			const moved = /* @__PURE__ */ new Set();
 			for (;;) {
 				const pending = (await vector.query({
 					indexName,
-					queryVector,
+					...readParams,
 					topK: 20,
-					includeVector: true,
 					filter: {
 						thread_id: threadId,
 						resource_id: { $ne: resourceId }
@@ -52062,7 +52160,7 @@ const createModelInstance = async (provider, modelId, version = "v2") => {
 	try {
 		const providerFn = version === `v1` ? { v1: {
 			openai: async () => {
-				const { openai } = await Promise.resolve().then(() => require("./dist-Ch5YGldj.cjs"));
+				const { openai } = await Promise.resolve().then(() => require("./dist-DgKeISkr.cjs"));
 				return openai(modelId);
 			},
 			anthropic: async () => {
@@ -55868,150 +55966,157 @@ Previous iterations may have fixed some issues, so start by re-running validateC
 		}
 	}
 });
-const agentBuilderTemplateWorkflow = (0, _mastra_core_workflows.createWorkflow)({
-	id: "agent-builder-template",
-	description: "Merges a Mastra template repository into the current project using intelligent AgentBuilder-powered merging",
-	inputSchema: AgentBuilderInputSchema,
-	outputSchema: ApplyResultSchema,
-	steps: [
-		cloneTemplateStep,
-		analyzePackageStep,
-		discoverUnitsStep,
-		orderUnitsStep,
-		packageMergeStep,
-		installStep,
-		programmaticFileCopyStep,
-		intelligentMergeStep,
-		validationAndFixStep
-	]
-}).then(cloneTemplateStep).map(async ({ getStepResult }) => {
-	const cloneResult = getStepResult(cloneTemplateStep);
-	if (shouldAbortWorkflow(cloneResult)) throw new Error(`Critical failure in clone step: ${cloneResult.error}`);
-	return cloneResult;
-}).parallel([analyzePackageStep, discoverUnitsStep]).map(async ({ getStepResult }) => {
-	const analyzeResult = getStepResult(analyzePackageStep);
-	const discoverResult = getStepResult(discoverUnitsStep);
-	if (shouldAbortWorkflow(analyzeResult)) throw new Error(`Failure in analyze package step: ${analyzeResult.error || "Package analysis failed"}`);
-	if (shouldAbortWorkflow(discoverResult)) throw new Error(`Failure in discover units step: ${discoverResult.error || "Unit discovery failed"}`);
-	return discoverResult;
-}).then(orderUnitsStep).map(async ({ getStepResult, getInitData }) => {
-	const cloneResult = getStepResult(cloneTemplateStep);
-	const initData = getInitData();
-	return {
-		commitSha: cloneResult.commitSha,
-		slug: cloneResult.slug,
-		targetPath: initData.targetPath
-	};
-}).then(prepareBranchStep).map(async ({ getStepResult, getInitData }) => {
-	const cloneResult = getStepResult(cloneTemplateStep);
-	const packageResult = getStepResult(analyzePackageStep);
-	const initData = getInitData();
-	return {
-		commitSha: cloneResult.commitSha,
-		slug: cloneResult.slug,
-		targetPath: initData.targetPath,
-		packageInfo: packageResult
-	};
-}).then(packageMergeStep).map(async ({ getInitData }) => {
-	return { targetPath: getInitData().targetPath };
-}).then(installStep).map(async ({ getStepResult, getInitData }) => {
-	const cloneResult = getStepResult(cloneTemplateStep);
-	const orderResult = getStepResult(orderUnitsStep);
-	const installResult = getStepResult(installStep);
-	const initData = getInitData();
-	if (shouldAbortWorkflow(installResult)) throw new Error(`Failure in install step: ${installResult.error || "Install failed"}`);
-	return {
-		orderedUnits: orderResult.orderedUnits,
-		templateDir: cloneResult.templateDir,
-		commitSha: cloneResult.commitSha,
-		slug: cloneResult.slug,
-		targetPath: initData.targetPath,
-		variables: initData.variables
-	};
-}).then(programmaticFileCopyStep).map(async ({ getStepResult, getInitData }) => {
-	const copyResult = getStepResult(programmaticFileCopyStep);
-	const cloneResult = getStepResult(cloneTemplateStep);
-	const initData = getInitData();
-	return {
-		conflicts: copyResult.conflicts,
-		copiedFiles: copyResult.copiedFiles,
-		commitSha: cloneResult.commitSha,
-		slug: cloneResult.slug,
-		targetPath: initData.targetPath,
-		templateDir: cloneResult.templateDir
-	};
-}).then(intelligentMergeStep).map(async ({ getStepResult, getInitData }) => {
-	const cloneResult = getStepResult(cloneTemplateStep);
-	const orderResult = getStepResult(orderUnitsStep);
-	const copyResult = getStepResult(programmaticFileCopyStep);
-	const mergeResult = getStepResult(intelligentMergeStep);
-	const initData = getInitData();
-	return {
-		commitSha: cloneResult.commitSha,
-		slug: cloneResult.slug,
-		targetPath: initData.targetPath,
-		templateDir: cloneResult.templateDir,
-		orderedUnits: orderResult.orderedUnits,
-		copiedFiles: copyResult.copiedFiles,
-		conflictsResolved: mergeResult.conflictsResolved
-	};
-}).then(validationAndFixStep).map(async ({ getStepResult }) => {
-	const cloneResult = getStepResult(cloneTemplateStep);
-	const analyzeResult = getStepResult(analyzePackageStep);
-	const discoverResult = getStepResult(discoverUnitsStep);
-	const orderResult = getStepResult(orderUnitsStep);
-	const prepareBranchResult = getStepResult(prepareBranchStep);
-	const packageMergeResult = getStepResult(packageMergeStep);
-	const installResult = getStepResult(installStep);
-	const copyResult = getStepResult(programmaticFileCopyStep);
-	const intelligentMergeResult = getStepResult(intelligentMergeStep);
-	const validationResult = getStepResult(validationAndFixStep);
-	const branchName = prepareBranchResult.branchName;
-	const allErrors = [
-		cloneResult.error,
-		analyzeResult.error,
-		discoverResult.error,
-		orderResult.error,
-		prepareBranchResult.error,
-		packageMergeResult.error,
-		installResult.error,
-		copyResult.error,
-		intelligentMergeResult.error,
-		validationResult.error
-	].filter(Boolean);
-	const overallSuccess = cloneResult.success !== false && analyzeResult.success !== false && discoverResult.success !== false && orderResult.success !== false && prepareBranchResult.success !== false && packageMergeResult.success !== false && installResult.success !== false && copyResult.success !== false && intelligentMergeResult.success !== false && validationResult.success !== false;
-	const messages = [];
-	if (copyResult.copiedFiles?.length > 0) messages.push(`${copyResult.copiedFiles.length} files copied`);
-	if (copyResult.conflicts?.length > 0) messages.push(`${copyResult.conflicts.length} conflicts skipped`);
-	if (intelligentMergeResult.conflictsResolved?.length > 0) messages.push(`${intelligentMergeResult.conflictsResolved.length} conflicts resolved`);
-	if (validationResult.validationResults?.errorsFixed > 0) messages.push(`${validationResult.validationResults.errorsFixed} validation errors fixed`);
-	if (validationResult.validationResults?.remainingErrors > 0) messages.push(`${validationResult.validationResults.remainingErrors} validation issues remain`);
-	const comprehensiveMessage = messages.length > 0 ? `Template merge completed: ${messages.join(", ")}` : validationResult.message || "Template merge completed";
-	return {
-		success: overallSuccess,
-		applied: validationResult.applied || copyResult.copiedFiles?.length > 0 || false,
-		message: comprehensiveMessage,
-		validationResults: validationResult.validationResults,
-		error: allErrors.length > 0 ? allErrors.join("; ") : void 0,
-		errors: allErrors.length > 0 ? allErrors : void 0,
-		branchName,
-		stepResults: {
-			cloneSuccess: cloneResult.success,
-			analyzeSuccess: analyzeResult.success,
-			discoverSuccess: discoverResult.success,
-			orderSuccess: orderResult.success,
-			prepareBranchSuccess: prepareBranchResult.success,
-			packageMergeSuccess: packageMergeResult.success,
-			installSuccess: installResult.success,
-			copySuccess: copyResult.success,
-			mergeSuccess: intelligentMergeResult.success,
-			validationSuccess: validationResult.success,
-			filesCopied: copyResult.copiedFiles?.length || 0,
-			conflictsSkipped: copyResult.conflicts?.length || 0,
-			conflictsResolved: intelligentMergeResult.conflictsResolved?.length || 0
-		}
-	};
-}).commit();
+/**
+* Builds a new template-merge workflow on every call. See `createAgentBuilderWorkflows` for when to use a factory
+* instead of the shared `agentBuilderTemplateWorkflow`.
+*/
+function createAgentBuilderTemplateWorkflow() {
+	return (0, _mastra_core_workflows.createWorkflow)({
+		id: "agent-builder-template",
+		description: "Merges a Mastra template repository into the current project using intelligent AgentBuilder-powered merging",
+		inputSchema: AgentBuilderInputSchema,
+		outputSchema: ApplyResultSchema,
+		steps: [
+			cloneTemplateStep,
+			analyzePackageStep,
+			discoverUnitsStep,
+			orderUnitsStep,
+			packageMergeStep,
+			installStep,
+			programmaticFileCopyStep,
+			intelligentMergeStep,
+			validationAndFixStep
+		]
+	}).then(cloneTemplateStep).map(async ({ getStepResult }) => {
+		const cloneResult = getStepResult(cloneTemplateStep);
+		if (shouldAbortWorkflow(cloneResult)) throw new Error(`Critical failure in clone step: ${cloneResult.error}`);
+		return cloneResult;
+	}).parallel([analyzePackageStep, discoverUnitsStep]).map(async ({ getStepResult }) => {
+		const analyzeResult = getStepResult(analyzePackageStep);
+		const discoverResult = getStepResult(discoverUnitsStep);
+		if (shouldAbortWorkflow(analyzeResult)) throw new Error(`Failure in analyze package step: ${analyzeResult.error || "Package analysis failed"}`);
+		if (shouldAbortWorkflow(discoverResult)) throw new Error(`Failure in discover units step: ${discoverResult.error || "Unit discovery failed"}`);
+		return discoverResult;
+	}).then(orderUnitsStep).map(async ({ getStepResult, getInitData }) => {
+		const cloneResult = getStepResult(cloneTemplateStep);
+		const initData = getInitData();
+		return {
+			commitSha: cloneResult.commitSha,
+			slug: cloneResult.slug,
+			targetPath: initData.targetPath
+		};
+	}).then(prepareBranchStep).map(async ({ getStepResult, getInitData }) => {
+		const cloneResult = getStepResult(cloneTemplateStep);
+		const packageResult = getStepResult(analyzePackageStep);
+		const initData = getInitData();
+		return {
+			commitSha: cloneResult.commitSha,
+			slug: cloneResult.slug,
+			targetPath: initData.targetPath,
+			packageInfo: packageResult
+		};
+	}).then(packageMergeStep).map(async ({ getInitData }) => {
+		return { targetPath: getInitData().targetPath };
+	}).then(installStep).map(async ({ getStepResult, getInitData }) => {
+		const cloneResult = getStepResult(cloneTemplateStep);
+		const orderResult = getStepResult(orderUnitsStep);
+		const installResult = getStepResult(installStep);
+		const initData = getInitData();
+		if (shouldAbortWorkflow(installResult)) throw new Error(`Failure in install step: ${installResult.error || "Install failed"}`);
+		return {
+			orderedUnits: orderResult.orderedUnits,
+			templateDir: cloneResult.templateDir,
+			commitSha: cloneResult.commitSha,
+			slug: cloneResult.slug,
+			targetPath: initData.targetPath,
+			variables: initData.variables
+		};
+	}).then(programmaticFileCopyStep).map(async ({ getStepResult, getInitData }) => {
+		const copyResult = getStepResult(programmaticFileCopyStep);
+		const cloneResult = getStepResult(cloneTemplateStep);
+		const initData = getInitData();
+		return {
+			conflicts: copyResult.conflicts,
+			copiedFiles: copyResult.copiedFiles,
+			commitSha: cloneResult.commitSha,
+			slug: cloneResult.slug,
+			targetPath: initData.targetPath,
+			templateDir: cloneResult.templateDir
+		};
+	}).then(intelligentMergeStep).map(async ({ getStepResult, getInitData }) => {
+		const cloneResult = getStepResult(cloneTemplateStep);
+		const orderResult = getStepResult(orderUnitsStep);
+		const copyResult = getStepResult(programmaticFileCopyStep);
+		const mergeResult = getStepResult(intelligentMergeStep);
+		const initData = getInitData();
+		return {
+			commitSha: cloneResult.commitSha,
+			slug: cloneResult.slug,
+			targetPath: initData.targetPath,
+			templateDir: cloneResult.templateDir,
+			orderedUnits: orderResult.orderedUnits,
+			copiedFiles: copyResult.copiedFiles,
+			conflictsResolved: mergeResult.conflictsResolved
+		};
+	}).then(validationAndFixStep).map(async ({ getStepResult }) => {
+		const cloneResult = getStepResult(cloneTemplateStep);
+		const analyzeResult = getStepResult(analyzePackageStep);
+		const discoverResult = getStepResult(discoverUnitsStep);
+		const orderResult = getStepResult(orderUnitsStep);
+		const prepareBranchResult = getStepResult(prepareBranchStep);
+		const packageMergeResult = getStepResult(packageMergeStep);
+		const installResult = getStepResult(installStep);
+		const copyResult = getStepResult(programmaticFileCopyStep);
+		const intelligentMergeResult = getStepResult(intelligentMergeStep);
+		const validationResult = getStepResult(validationAndFixStep);
+		const branchName = prepareBranchResult.branchName;
+		const allErrors = [
+			cloneResult.error,
+			analyzeResult.error,
+			discoverResult.error,
+			orderResult.error,
+			prepareBranchResult.error,
+			packageMergeResult.error,
+			installResult.error,
+			copyResult.error,
+			intelligentMergeResult.error,
+			validationResult.error
+		].filter(Boolean);
+		const overallSuccess = cloneResult.success !== false && analyzeResult.success !== false && discoverResult.success !== false && orderResult.success !== false && prepareBranchResult.success !== false && packageMergeResult.success !== false && installResult.success !== false && copyResult.success !== false && intelligentMergeResult.success !== false && validationResult.success !== false;
+		const messages = [];
+		if (copyResult.copiedFiles?.length > 0) messages.push(`${copyResult.copiedFiles.length} files copied`);
+		if (copyResult.conflicts?.length > 0) messages.push(`${copyResult.conflicts.length} conflicts skipped`);
+		if (intelligentMergeResult.conflictsResolved?.length > 0) messages.push(`${intelligentMergeResult.conflictsResolved.length} conflicts resolved`);
+		if (validationResult.validationResults?.errorsFixed > 0) messages.push(`${validationResult.validationResults.errorsFixed} validation errors fixed`);
+		if (validationResult.validationResults?.remainingErrors > 0) messages.push(`${validationResult.validationResults.remainingErrors} validation issues remain`);
+		const comprehensiveMessage = messages.length > 0 ? `Template merge completed: ${messages.join(", ")}` : validationResult.message || "Template merge completed";
+		return {
+			success: overallSuccess,
+			applied: validationResult.applied || copyResult.copiedFiles?.length > 0 || false,
+			message: comprehensiveMessage,
+			validationResults: validationResult.validationResults,
+			error: allErrors.length > 0 ? allErrors.join("; ") : void 0,
+			errors: allErrors.length > 0 ? allErrors : void 0,
+			branchName,
+			stepResults: {
+				cloneSuccess: cloneResult.success,
+				analyzeSuccess: analyzeResult.success,
+				discoverSuccess: discoverResult.success,
+				orderSuccess: orderResult.success,
+				prepareBranchSuccess: prepareBranchResult.success,
+				packageMergeSuccess: packageMergeResult.success,
+				installSuccess: installResult.success,
+				copySuccess: copyResult.success,
+				mergeSuccess: intelligentMergeResult.success,
+				validationSuccess: validationResult.success,
+				filesCopied: copyResult.copiedFiles?.length || 0,
+				conflictsSkipped: copyResult.conflicts?.length || 0,
+				conflictsResolved: intelligentMergeResult.conflictsResolved?.length || 0
+			}
+		};
+	}).commit();
+}
+createAgentBuilderTemplateWorkflow();
 const determineConflictStrategy = (_unit, _targetFile) => {
 	return "skip";
 };
@@ -58907,25 +59012,32 @@ ${tasks.map((task, i) => `${i + 1}. [${task.priority.toUpperCase()}] ${task.cont
 		};
 	}
 });
-const planningAndApprovalWorkflow = (0, _mastra_core_workflows.createWorkflow)({
-	id: "planning-and-approval",
-	description: "Handle iterative planning with questions and task list approval",
-	inputSchema: PlanningIterationInputSchema,
-	outputSchema: TaskApprovalOutputSchema,
-	steps: [planningIterationStep, taskApprovalStep]
-}).dountil(planningIterationStep, async ({ inputData }) => {
-	console.info(`Sub-workflow planning check: planComplete=${inputData.planComplete}`);
-	return inputData.planComplete === true;
-}).map(async ({ inputData }) => {
-	return {
-		tasks: inputData.tasks || [],
-		success: inputData.success || false,
-		questions: inputData.questions || [],
-		reasoning: inputData.reasoning || "",
-		planComplete: inputData.planComplete || false,
-		message: inputData.message || ""
-	};
-}).then(taskApprovalStep).commit();
+/**
+* Builds a new planning-and-approval sub-workflow on every call. See `createAgentBuilderWorkflows` for when to use
+* a factory instead of the shared `planningAndApprovalWorkflow`.
+*/
+function createPlanningAndApprovalWorkflow() {
+	return (0, _mastra_core_workflows.createWorkflow)({
+		id: "planning-and-approval",
+		description: "Handle iterative planning with questions and task list approval",
+		inputSchema: PlanningIterationInputSchema,
+		outputSchema: TaskApprovalOutputSchema,
+		steps: [planningIterationStep, taskApprovalStep]
+	}).dountil(planningIterationStep, async ({ inputData }) => {
+		console.info(`Sub-workflow planning check: planComplete=${inputData.planComplete}`);
+		return inputData.planComplete === true;
+	}).map(async ({ inputData }) => {
+		return {
+			tasks: inputData.tasks || [],
+			success: inputData.success || false,
+			questions: inputData.questions || [],
+			reasoning: inputData.reasoning || "",
+			planComplete: inputData.planComplete || false,
+			message: inputData.message || ""
+		};
+	}).then(taskApprovalStep).commit();
+}
+createPlanningAndApprovalWorkflow();
 const workflowResearch = `
 ## 🔍 **COMPREHENSIVE MASTRA WORKFLOW RESEARCH SUMMARY**
 
@@ -59714,9 +59826,13 @@ ${workflowBuilderPrompts.validation.instructions}`;
 		}
 	}
 });
-const agentBuilderWorkflows = {
-	"merge-template": agentBuilderTemplateWorkflow,
-	"workflow-builder": (0, _mastra_core_workflows.createWorkflow)({
+/**
+* Builds a new workflow-builder workflow, with its own planning-and-approval sub-workflow, on every call. See
+* `createAgentBuilderWorkflows` for when to use a factory instead of the shared `workflowBuilderWorkflow`.
+*/
+function createWorkflowBuilderWorkflow() {
+	const planningAndApprovalWorkflow = createPlanningAndApprovalWorkflow();
+	return (0, _mastra_core_workflows.createWorkflow)({
 		id: "workflow-builder",
 		description: "Create or edit Mastra workflows using AI-powered assistance with iterative planning",
 		inputSchema: WorkflowBuilderInputSchema,
@@ -59761,9 +59877,30 @@ const agentBuilderWorkflows = {
 			research: workflowResearch,
 			projectPath: initData.projectPath || process.cwd()
 		};
-	}).then(taskExecutionStep).commit()
-};
-exports.agentBuilderWorkflows = agentBuilderWorkflows;
+	}).then(taskExecutionStep).commit();
+}
+createWorkflowBuilderWorkflow();
+/**
+* Builds a new set of agent-builder workflows on every call, with the same keys as `agentBuilderWorkflows`.
+*
+* Registering a workflow with a Mastra instance binds it to that instance's storage, logger and agents, and the
+* workflow keeps every run it has not finished. A workflow object registered with a second instance moves to it,
+* including runs that are still executing for the first one. Use this factory when one process runs several Mastra
+* instances, such as one per tenant or one per test, so each instance gets its own workflows and can be garbage
+* collected after `mastra.shutdown()`.
+*
+* @example
+* ```ts
+* const mastra = new Mastra({ workflows: createAgentBuilderWorkflows() });
+* ```
+*/
+function createAgentBuilderWorkflows() {
+	return {
+		"merge-template": createAgentBuilderTemplateWorkflow(),
+		"workflow-builder": createWorkflowBuilderWorkflow()
+	};
+}
+exports.createAgentBuilderWorkflows = createAgentBuilderWorkflows;
 exports.createOpenAI = createOpenAI;
 exports.openai = openai;
 Object.defineProperty(exports, "require_avif", {
@@ -59839,4 +59976,4 @@ Object.defineProperty(exports, "require_webp", {
 	}
 });
 
-//# sourceMappingURL=dist-CPj7ZQaO.cjs.map
+//# sourceMappingURL=dist-BKNKucT9.cjs.map