@mastra/deployer 1.79.0-alpha.1 → 1.79.0-alpha.11

package/dist/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAKhE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAmB5B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAoBnD,KAAK,QAAQ,GAAG,YAAY,CAAC;AAE7B,KAAK,SAAS,GAAG,aAAa,GAAG;IAC/B,OAAO,EAAE,GAAG,CAAC;QAAE,UAAU,EAAE,+BAA+B,CAAA;KAAE,CAAC,CAAC;CAC/D,CAAC;AA8CF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,wCAmB/D;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,mBAER;cAegC,QAAQ;eAAa,SAAS;2CAmbhE;AAED,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAmC,mDAmMlG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAKhE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAmB5B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAoBnD,KAAK,QAAQ,GAAG,YAAY,CAAC;AAE7B,KAAK,SAAS,GAAG,aAAa,GAAG;IAC/B,OAAO,EAAE,GAAG,CAAC;QAAE,UAAU,EAAE,+BAA+B,CAAA;KAAE,CAAC,CAAC;CAC/D,CAAC;AA8CF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,wCAmB/D;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,mBAER;cAegC,QAAQ;eAAa,SAAS;2CA4bhE;AAED,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAmC,mDAmMlG"}

package/dist/server/index.js

@@ -1,5 +1,5 @@
 import { d as normalizeStudioBase, n as escapeStudioHtmlValue, o as injectStudioHtmlConfig } from "../utils-Bl3Lm7SI.js";
-import "../index-CLddUTqr-BXqo9et4.js";
+import "../index-CLddUTqr-86A1rnBL.js";
 import { createReadStream, existsSync, statSync } from "fs";
 import { readFile } from "fs/promises";
 import { dirname, join } from "path";
@@ -18,8 +18,8 @@ import util from "util";
 import { Buffer as Buffer$1 } from "buffer";
 import { bodyLimit } from "hono/body-limit";
 import { stream } from "hono/streaming";
-import "@mastra/core/request-context";
-import { findMatchingCustomRoute } from "@mastra/server/auth";
+import { RequestContext } from "@mastra/core/request-context";
+import { coreAuthMiddleware, findMatchingCustomRoute, isCustomRoutePublic } from "@mastra/server/auth";
 import { ViewerRegistry, handleInputMessage } from "@mastra/server/browser-stream";
 import { InMemoryTaskStore } from "@mastra/server/a2a/store";
 import { Hono } from "hono";
@@ -812,7 +812,7 @@ const buildOutgoingHttpHeaders = (headers, defaultContentType) => {
 const outgoingEnded = Symbol("outgoingEnded");
 const incomingDraining = Symbol("incomingDraining");
 const DRAIN_TIMEOUT_MS = 500;
-const MAX_DRAIN_BYTES = 64 * 1024 * 1024;
+const MAX_DRAIN_BYTES = 67108864;
 const drainIncoming = (incoming) => {
 	const incomingWithDrainState = incoming;
 	if (incoming.destroyed || incomingWithDrainState[incomingDraining]) return;
@@ -1759,13 +1759,15 @@ var ERR_INVALID_ARG_TYPE = class extends TypeError {
 			}
 			if (other.length > 0) msg += " or ";
 		}
-		if (other.length > 0) if (other.length > 2) {
-			const last = other.pop();
-			msg += `one of ${other.join(", ")}, or ${last}`;
-		} else if (other.length === 2) msg += `one of ${other[0]} or ${other[1]}`;
-		else {
-			if (other[0].toLowerCase() !== other[0]) msg += "an ";
-			msg += `${other[0]}`;
+		if (other.length > 0) {
+			if (other.length > 2) {
+				const last = other.pop();
+				msg += `one of ${other.join(", ")}, or ${last}`;
+			} else if (other.length === 2) msg += `one of ${other[0]} or ${other[1]}`;
+			else {
+				if (other[0].toLowerCase() !== other[0]) msg += "an ";
+				msg += `${other[0]}`;
+			}
 		}
 		msg += `. Received ${determineSpecificType(actual)}`;
 		super(msg);
@@ -1966,11 +1968,13 @@ var FetchIncomingMessage = class extends Readable {
 			field = field.slice(1);
 			if (typeof dest[field] === "string") dest[field] += (flag === 0 ? ", " : "; ") + value;
 			else dest[field] = value;
-		} else if (flag === 1) if (dest["set-cookie"] !== void 0) dest["set-cookie"].push(value);
-		else dest["set-cookie"] = [value];
-		else if (this.joinDuplicateHeaders) if (dest[field] === void 0) dest[field] = value;
-		else dest[field] += ", " + value;
-		else if (dest[field] === void 0) dest[field] = value;
+		} else if (flag === 1) {
+			if (dest["set-cookie"] !== void 0) dest["set-cookie"].push(value);
+			else dest["set-cookie"] = [value];
+		} else if (this.joinDuplicateHeaders) {
+			if (dest[field] === void 0) dest[field] = value;
+			else dest[field] += ", " + value;
+		} else if (dest[field] === void 0) dest[field] = value;
 	}
 	_addHeaderLineDistinct(field, value, dest) {
 		field = field.toLowerCase();
@@ -2051,7 +2055,6 @@ function matchKnownFields(field, lowercased = false) {
 		case 19:
 			if (field === "Proxy-Authorization" || field === "proxy-authorization") return "proxy-authorization";
 			if (field === "If-Unmodified-Since" || field === "if-unmodified-since") return "if-unmodified-since";
-			break;
 	}
 	if (lowercased) return "\0" + field;
 	return matchKnownFields(field.toLowerCase(), true);
@@ -2100,7 +2103,7 @@ function utcDate() {
 //#endregion
 //#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/fetch-to-node/2.1.0/75a085586b95f3a18a440f8655a7cb5c851846ab2c5e6ad2c4ae036e3bbaa05c/node_modules/fetch-to-node/dist/fetch-to-node/internal-streams-state.js
 function getDefaultHighWaterMark(objectMode) {
-	return objectMode ? 16 : 64 * 1024;
+	return objectMode ? 16 : 65536;
 }
 //#endregion
 //#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/fetch-to-node/2.1.0/75a085586b95f3a18a440f8655a7cb5c851846ab2c5e6ad2c4ae036e3bbaa05c/node_modules/fetch-to-node/dist/fetch-to-node/http-common.js
@@ -2388,15 +2391,16 @@ var FetchOutgoingMessage = class extends Writable {
 				const entry = headers[key];
 				processHeader(this, state, entry[0], entry[1], false);
 			}
-			else if (Array.isArray(headers)) if (headers.length && Array.isArray(headers[0])) for (let i = 0; i < headers.length; i++) {
-				const entry = headers[i];
-				processHeader(this, state, entry[0], entry[1], true);
-			}
-			else {
-				if (headers.length % 2 !== 0) throw new ERR_INVALID_ARG_VALUE("headers", headers);
-				for (let n = 0; n < headers.length; n += 2) processHeader(this, state, headers[n], headers[n + 1], true);
-			}
-			else for (const key in headers) if (headers.hasOwnProperty(key)) {
+			else if (Array.isArray(headers)) {
+				if (headers.length && Array.isArray(headers[0])) for (let i = 0; i < headers.length; i++) {
+					const entry = headers[i];
+					processHeader(this, state, entry[0], entry[1], true);
+				}
+				else {
+					if (headers.length % 2 !== 0) throw new ERR_INVALID_ARG_VALUE("headers", headers);
+					for (let n = 0; n < headers.length; n += 2) processHeader(this, state, headers[n], headers[n + 1], true);
+				}
+			} else for (const key in headers) if (headers.hasOwnProperty(key)) {
 				const _headers = headers;
 				processHeader(this, state, key, _headers[key], true);
 			}
@@ -2425,13 +2429,15 @@ var FetchOutgoingMessage = class extends Writable {
 				header += "Connection: close\r\n";
 			}
 		}
-		if (!state.contLen && !state.te) if (!this._hasBody) this.chunkedEncoding = false;
-		else if (!this.useChunkedEncodingByDefault) this._last = true;
-		else if (!state.trailer && !this._removedContLen && typeof this._contentLength === "number") header += "Content-Length: " + this._contentLength + "\r\n";
-		else if (!this._removedTE) {
-			header += "Transfer-Encoding: chunked\r\n";
-			this.chunkedEncoding = true;
-		} else this._last = true;
+		if (!state.contLen && !state.te) {
+			if (!this._hasBody) this.chunkedEncoding = false;
+			else if (!this.useChunkedEncodingByDefault) this._last = true;
+			else if (!state.trailer && !this._removedContLen && typeof this._contentLength === "number") header += "Content-Length: " + this._contentLength + "\r\n";
+			else if (!this._removedTE) {
+				header += "Transfer-Encoding: chunked\r\n";
+				this.chunkedEncoding = true;
+			} else this._last = true;
+		}
 		if (this.chunkedEncoding !== true && state.trailer) throw new ERR_HTTP_TRAILER_INVALID();
 		this._header = header + "\r\n";
 		this._headerSent = false;
@@ -2575,9 +2581,7 @@ var FetchOutgoingMessage = class extends Writable {
 			case "transfer-encoding":
 				this._removedTE = true;
 				break;
-			case "date":
-				this.sendDate = false;
-				break;
+			case "date": this.sendDate = false;
 		}
 		if (this[kOutHeaders] !== null) delete this[kOutHeaders][key];
 	}
@@ -2648,8 +2652,10 @@ var FetchOutgoingMessage = class extends Writable {
 			if (this._writtenDataBuffer != null) this._writtenDataBuffer.cork();
 			write_(this, chunk, encoding, null, true);
 		} else if (this.finished) {
-			if (typeof callback === "function") if (!this.writableFinished) this.on("finish", callback);
-			else callback(new ERR_STREAM_ALREADY_FINISHED("end"));
+			if (typeof callback === "function") {
+				if (!this.writableFinished) this.on("finish", callback);
+				else callback(new ERR_STREAM_ALREADY_FINISHED("end"));
+			}
 			return this;
 		} else if (!this._header) {
 			if (this._writtenDataBuffer != null) this._writtenDataBuffer.cork();
@@ -2714,8 +2720,10 @@ var FetchOutgoingMessage = class extends Writable {
 };
 function processHeader(self, state, key, value, validate) {
 	if (validate) validateHeaderName(key);
-	if (isContentDispositionField(key) && self._contentLength) if (Array.isArray(value)) for (let i = 0; i < value.length; i++) value[i] = String(Buffer$1.from(String(value[i]), "latin1"));
-	else value = String(Buffer$1.from(String(value), "latin1"));
+	if (isContentDispositionField(key) && self._contentLength) {
+		if (Array.isArray(value)) for (let i = 0; i < value.length; i++) value[i] = String(Buffer$1.from(String(value[i]), "latin1"));
+		else value = String(Buffer$1.from(String(value), "latin1"));
+	}
 	if (Array.isArray(value)) {
 		if ((value.length < 2 || !isCookieField(key)) && (!self[kUniqueHeaders] || !self[kUniqueHeaders].has(key.toLowerCase()))) {
 			for (let i = 0; i < value.length; i++) storeHeader(self, state, key, value[i], validate);
@@ -2765,9 +2773,7 @@ function matchHeader(self, state, field, value) {
 		case "trailer":
 			state[field] = true;
 			break;
-		case "keep-alive":
-			self._defaultKeepAlive = false;
-			break;
+		case "keep-alive": self._defaultKeepAlive = false;
 	}
 }
 function onError(msg, err, callback) {
@@ -2810,10 +2816,12 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
 		}
 		msg._implicitHeader();
 	}
-	if (!msg._hasBody) if (msg[kRejectNonStandardBodyWrites]) throw new ERR_HTTP_BODY_NOT_ALLOWED();
-	else {
-		setTimeout(callback, 0);
-		return true;
+	if (!msg._hasBody) {
+		if (msg[kRejectNonStandardBodyWrites]) throw new ERR_HTTP_BODY_NOT_ALLOWED();
+		else {
+			setTimeout(callback, 0);
+			return true;
+		}
 	}
 	if (!fromEnd && msg._writtenDataBuffer != null && !msg._writtenDataBuffer.writableCorked) {
 		msg._writtenDataBuffer.cork();
@@ -3011,8 +3019,10 @@ var FetchServerResponse = class FetchServerResponse extends FetchOutgoingMessage
 			}
 			data = data.slice(this.writtenHeaderBytes);
 		}
-		if (typeof data === "string") if (encoding === void 0 || encoding === "utf8" || encoding === "utf-8") data = FetchServerResponse.encoder.encode(data);
-		else data = Buffer$1.from(data, encoding ?? void 0);
+		if (typeof data === "string") {
+			if (encoding === void 0 || encoding === "utf8" || encoding === "utf-8") data = FetchServerResponse.encoder.encode(data);
+			else data = Buffer$1.from(data, encoding ?? void 0);
+		}
 		return data ?? Buffer$1.from([]);
 	}
 	_finish() {
@@ -3196,6 +3206,191 @@ function propagateClientDisconnect(fetchResponse, res) {
 		headers: fetchResponse.headers
 	});
 }
+function createAuthMiddleware({ mastra, requiresAuth = true }) {
+	return async (c, next) => {
+		if (!requiresAuth) return next();
+		const authConfig = mastra.getServer()?.auth;
+		if (!authConfig) return next();
+		const requestContext = c.get("requestContext") ?? new RequestContext();
+		c.set("requestContext", requestContext);
+		c.set("mastra", c.get("mastra") ?? mastra);
+		const path = c.req.path;
+		const method = c.req.method;
+		const customRouteAuthConfig = new Map(c.get("customRouteAuthConfig") ?? []);
+		if (!isCustomRoutePublic(path, method, customRouteAuthConfig)) customRouteAuthConfig.set(`${method}:${path}`, true);
+		const authHeader = c.req.header("Authorization");
+		let token = authHeader ? authHeader.replace("Bearer ", "") : null;
+		if (!token) token = c.req.query("apiKey") || null;
+		const result = await coreAuthMiddleware({
+			path,
+			method,
+			getHeader: (name) => c.req.header(name),
+			mastra,
+			authConfig,
+			customRouteAuthConfig,
+			requestContext,
+			rawRequest: c.req.raw,
+			token,
+			buildAuthorizeContext: () => c
+		});
+		for (const [key, value] of Object.entries(result.headers ?? {})) c.header(key, value, key.toLowerCase() === "set-cookie" ? { append: true } : void 0);
+		if (result.action === "next") return next();
+		return c.json(result.body, result.status);
+	};
+}
+const TICKET_BYTES = 32;
+/**
+* How long an issued ticket stays valid. A ticket is minted immediately before
+* the socket is opened, so this only has to cover the round trip plus the
+* handshake — short enough that a ticket leaked from a log is useless by the
+* time anyone can act on it.
+*/
+const UPGRADE_TICKET_TTL_MS = 3e4;
+/**
+* Ceiling on tracked per-agent issuance counters, so the limiter can't grow
+* without bound as agent ids are invented. Counters are evicted oldest first.
+*/
+const MAX_TRACKED_AGENTS = 500;
+/** 256 bits of base64url, so the ticket can't be guessed or enumerated. */
+function createTicketValue() {
+	const bytes = new Uint8Array(TICKET_BYTES);
+	globalThis.crypto.getRandomValues(bytes);
+	return btoa(String.fromCharCode(...bytes)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}
+/**
+* Short-lived, single-use credentials for browser WebSocket upgrades.
+*
+* A browser cannot set an `Authorization` header on a WebSocket handshake, so a
+* deployment that authenticates with a header token would otherwise have to put
+* that reusable token in the handshake URL, where proxies and access logs can
+* retain it. Instead the client asks an authenticated HTTP route for a ticket,
+* and the ticket — worthless once spent, and scoped to one agent and thread —
+* travels in the URL instead.
+*
+* In-process, like the `ViewerRegistry` and the browser sessions it serves: a
+* screencast is bound to the process holding the browser, so a ticket store
+* shared across replicas would buy nothing. A ticket presented to a different
+* replica fails for the same reason the stream itself would.
+*
+* Issuance is bounded so the mint endpoint can't be turned into memory or CPU
+* exhaustion: tickets that are never spent live at most one TTL, a full store
+* rejects instead of growing, and each agent has a request allowance. Expiry is
+* swept from the front of the insertion-ordered map, so cleanup costs the
+* number of entries actually expired rather than a scan of every outstanding
+* ticket per request.
+*/
+var UpgradeTicketStore = class {
+	#tickets = /* @__PURE__ */ new Map();
+	#issuance = /* @__PURE__ */ new Map();
+	#now;
+	constructor(now = () => Date.now()) {
+		this.#now = now;
+	}
+	/**
+	* Issue a ticket bound to one agent and thread. Returns `{ ok: false }` when
+	* the agent exceeded its allowance or the store is at capacity.
+	*/
+	issue(agentId, threadId, ttlMs = UPGRADE_TICKET_TTL_MS) {
+		const now = this.#now();
+		this.#prune(now);
+		if (this.#tickets.size >= 500) return {
+			ok: false,
+			reason: "capacity"
+		};
+		const window = this.#issuance.get(agentId);
+		if (!window || now - window.windowStart >= 6e4) this.#trackIssuance(agentId, {
+			windowStart: now,
+			count: 0
+		});
+		else if (window.count >= 30) return {
+			ok: false,
+			reason: "rate-limited"
+		};
+		this.#issuance.get(agentId).count += 1;
+		const ticket = createTicketValue();
+		this.#tickets.set(ticket, {
+			agentId,
+			threadId,
+			expiresAt: now + ttlMs
+		});
+		return {
+			ok: true,
+			ticket,
+			expiresIn: Math.ceil(ttlMs / 1e3)
+		};
+	}
+	/**
+	* Spend a ticket. Returns `true` only when the ticket is unexpired and was
+	* issued for this exact agent and thread, in which case it is consumed and a
+	* second presentation fails.
+	*/
+	consume(ticket, agentId, threadId) {
+		const entry = this.#tickets.get(ticket);
+		if (!entry) return false;
+		if (entry.expiresAt <= this.#now()) return false;
+		if (entry.agentId !== agentId) return false;
+		if ((entry.threadId ?? void 0) !== (threadId ?? void 0)) return false;
+		this.#tickets.delete(ticket);
+		return true;
+	}
+	/**
+	* Drop expired tickets from the front of the insertion-ordered map. Tickets
+	* are inserted in issue order and share a TTL, so the entries after the first
+	* live one are live too and the sweep can stop there.
+	*/
+	#prune(now) {
+		for (const [ticket, entry] of this.#tickets) {
+			if (entry.expiresAt > now) break;
+			this.#tickets.delete(ticket);
+		}
+	}
+	/** Record an issuance window, evicting the oldest counter when at the cap. */
+	#trackIssuance(agentId, window) {
+		this.#issuance.delete(agentId);
+		this.#issuance.set(agentId, window);
+		if (this.#issuance.size > MAX_TRACKED_AGENTS) {
+			const oldest = this.#issuance.keys().next().value;
+			if (oldest !== void 0) this.#issuance.delete(oldest);
+		}
+	}
+};
+const TICKET_BODY_MAX_BYTES = 4096;
+/**
+* Resolve an `allowedOrigins` value against the request's `Origin` header.
+*
+* Mirrors Hono's `cors.origin` semantics so the same config value means the same
+* thing on the upgrade as it does on the HTTP routes: `'*'` allows everything,
+* array entries match literally, and a callback is only an approval when it
+* returns the request's own origin (the value Hono would echo back) or `'*'`.
+*/
+async function isOriginAllowed(allowedOrigins, origin, c) {
+	if (Array.isArray(allowedOrigins)) return allowedOrigins.includes(origin);
+	if (typeof allowedOrigins === "function") {
+		const allowed = await allowedOrigins(origin, c);
+		return allowed === origin || allowed === "*";
+	}
+	return allowedOrigins === "*" || allowedOrigins === origin;
+}
+/**
+* Is the `Origin` header the server's own origin?
+*
+* A Studio served by this server connects back to the same host, and operators
+* don't add their own origin to a CORS allowlist because same-origin requests
+* never needed CORS. Comparing hosts (rather than scheme + host) keeps that
+* working behind TLS-terminating proxies, where the server sees `http` while the
+* browser sends `https`.
+*/
+function isSameOrigin(origin, requestHost) {
+	if (!requestHost) return false;
+	let originHost;
+	try {
+		originHost = new URL(origin).host;
+	} catch {
+		return false;
+	}
+	const host = (requestHost.split(",")[0] ?? "").trim();
+	return originHost !== "" && originHost.toLowerCase() === host.toLowerCase();
+}
 /**
 * Set up WebSocket-based browser stream endpoint for real-time screencast viewing.
 *
@@ -3205,6 +3400,17 @@ function propagateClientDisconnect(fetchResponse, res) {
 * - Broadcasts frames to all connected viewers
 * - Stops screencast when last viewer disconnects
 *
+* All routes are authenticated with the server's auth configuration. Browsers
+* cannot attach an `Authorization` header to a WebSocket upgrade, so
+* session-cookie providers authenticate from the upgrade request's cookies.
+* Clients that authenticate with a header token instead request a short-lived,
+* single-use ticket from `POST ${apiPrefix}/agents/:agentId/browser/stream-ticket`
+* and pass it to the upgrade as `?ticket=`, which keeps the reusable credential
+* out of the URL. Non-browser clients can pass the token as the `apiKey` query
+* parameter — use a short-lived token, since a URL can be retained in proxy and
+* access logs, and prefer the `Authorization` header on the HTTP routes where the
+* client can set one.
+*
 * **Note**: Requires `ws` package to be installed. If not available, returns null
 * and logs a warning. Browser streaming will be disabled but everything else works.
 *
@@ -3220,6 +3426,7 @@ function propagateClientDisconnect(fetchResponse, res) {
 *
 * const app = new Hono();
 * const browserStream = await setupBrowserStream(app, {
+*   mastra,
 *   getToolset: (agentId) => browserToolsets.get(agentId),
 * });
 *
@@ -3242,7 +3449,24 @@ async function setupBrowserStream(app, config) {
 	const registry = new ViewerRegistry();
 	const rawPrefix = config.apiPrefix ?? "/api";
 	const apiPrefix = (rawPrefix.endsWith("/") ? rawPrefix.slice(0, -1) : rawPrefix) || "/api";
-	app.get("/browser/:agentId/stream", upgradeWebSocket((c) => {
+	const authenticate = createAuthMiddleware({ mastra: config.mastra });
+	const upgradeTickets = new UpgradeTicketStore();
+	const authorizeUpgrade = async (c, next) => {
+		const ticket = c.req.query("ticket");
+		if (!ticket) return authenticate(c, next);
+		const agentId = c.req.param("agentId");
+		if (!upgradeTickets.consume(ticket, agentId, c.req.query("threadId"))) return c.json({ error: "Invalid or expired upgrade ticket" }, 401);
+		return next();
+	};
+	const allowedOrigins = config.allowedOrigins;
+	const checkOrigin = async (c, next) => {
+		const origin = c.req.header("origin");
+		if (!allowedOrigins || !origin) return next();
+		if (isSameOrigin(origin, c.req.header("x-forwarded-host") ?? c.req.header("host"))) return next();
+		if (!await isOriginAllowed(allowedOrigins, origin, c)) return c.text("Forbidden", 403);
+		return next();
+	};
+	app.get("/browser/:agentId/stream", checkOrigin, authorizeUpgrade, upgradeWebSocket((c) => {
 		const agentId = c.req.param("agentId");
 		const threadId = c.req.query("threadId");
 		const viewerKey = threadId ? `${agentId}:${threadId}` : agentId;
@@ -3264,7 +3488,29 @@ async function setupBrowserStream(app, config) {
 			}
 		};
 	}));
-	app.get(`${apiPrefix}/agents/:agentId/browser/session`, async (c) => {
+	const ticketBodyLimit = bodyLimit({
+		maxSize: TICKET_BODY_MAX_BYTES,
+		onError: (c) => c.json({ error: "Request body too large" }, 413)
+	});
+	app.post(`${apiPrefix}/agents/:agentId/browser/stream-ticket`, authenticate, ticketBodyLimit, async (c) => {
+		const agentId = c.req.param("agentId");
+		if (!agentId) return c.json({ error: "Agent ID is required" }, 400);
+		let threadId = c.req.query("threadId");
+		try {
+			const body = await c.req.json();
+			if (!threadId && typeof body?.threadId === "string") threadId = body.threadId;
+		} catch {}
+		const issued = upgradeTickets.issue(agentId, threadId);
+		if (!issued.ok) {
+			const error = issued.reason === "capacity" ? "Too many outstanding browser stream upgrade tickets" : "Too many browser stream upgrade tickets requested";
+			return c.json({ error }, 429);
+		}
+		return c.json({
+			ticket: issued.ticket,
+			expiresIn: issued.expiresIn
+		});
+	});
+	app.get(`${apiPrefix}/agents/:agentId/browser/session`, authenticate, async (c) => {
 		const agentId = c.req.param("agentId");
 		if (!agentId) return c.json({ error: "Agent ID is required" }, 400);
 		const threadId = c.req.query("threadId");
@@ -3279,7 +3525,7 @@ async function setupBrowserStream(app, config) {
 			screencastAvailable: true
 		});
 	});
-	app.post(`${apiPrefix}/agents/:agentId/browser/close`, async (c) => {
+	app.post(`${apiPrefix}/agents/:agentId/browser/close`, authenticate, ticketBodyLimit, async (c) => {
 		const agentId = c.req.param("agentId");
 		if (!agentId) return c.json({ error: "Agent ID is required" }, 400);
 		const toolset = await config.getToolset(agentId);
@@ -3349,7 +3595,7 @@ const BODY_METHODS = /* @__PURE__ */ new Set([
 	"PATCH",
 	"DELETE"
 ]);
-var MastraServer$1 = class extends MastraServer {
+var MastraServer$2 = class extends MastraServer {
 	createContextMiddleware() {
 		return async (c, next) => {
 			if (this.hasCustomRouteHandler && BODY_METHODS.has(c.req.method) && c.req.raw.body) c.set(MASTRA_PRISTINE_REQUEST_KEY, c.req.raw.clone());
@@ -3891,7 +4137,7 @@ var MastraServer$1 = class extends MastraServer {
 	}
 };
 //#endregion
-//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono-openapi/1.3.1/2557b2465f29e88b77390131b99b4ae79c844dd5b524b41cc78f5b3bfa1fdf70/node_modules/hono-openapi/dist/index.js
+//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono-openapi/1.3.1/158235e7235efea6160a30c3ca102ac021a6d2f9183c16a3ddab0c84f82188b4/node_modules/hono-openapi/dist/index.js
 const uniqueSymbol = Symbol("openapi");
 function describeRoute(spec) {
 	const middleware = async (_c, next) => {
@@ -4592,7 +4838,10 @@ function welcomeHtml(apiPrefix = "/api") {
 const getStudioPath = () => {
 	if (process.env.MASTRA_STUDIO_PATH) return process.env.MASTRA_STUDIO_PATH;
 	let __dirname = ".";
-	if (import.meta.url) __dirname = dirname(fileURLToPath(import.meta.url));
+	if (import.meta.url) {
+		const __filename = fileURLToPath(import.meta.url);
+		__dirname = dirname(__filename);
+	}
 	return process.env.MASTRA_STUDIO_PATH || join(__dirname, "studio");
 };
 function isSchemaApiRoute(route) {
@@ -4678,10 +4927,10 @@ async function createHonoServer(mastra, options = { tools: {} }) {
 		return errorHandler(err, c, options.isDev);
 	});
 	const bodyLimitOptions = {
-		maxSize: server?.bodySizeLimit ?? 4.5 * 1024 * 1024,
+		maxSize: server?.bodySizeLimit ?? 4718592,
 		onError: () => ({ error: "Request body too large" })
 	};
-	const honoServerAdapter = new MastraServer$1({
+	const honoServerAdapter = new MastraServer$2({
 		app,
 		mastra,
 		tools: options.tools,
@@ -4696,7 +4945,10 @@ async function createHonoServer(mastra, options = { tools: {} }) {
 	honoServerAdapter.registerContextMiddleware();
 	const serverMiddleware = mastra.getServerMiddleware?.();
 	if (serverMiddleware && serverMiddleware.length > 0) for (const m of serverMiddleware) app.use(m.path, skipIfFrameworkPublic(m.handler));
+	const browserStreamOrigins = server?.cors && typeof server.cors === "object" && "origin" in server.cors ? server.cors.origin : void 0;
 	const browserStreamSetup = options.browserStream === false ? null : await setupBrowserStream(app, {
+		mastra,
+		allowedOrigins: browserStreamOrigins,
 		getToolset: async (agentId) => {
 			const resolveBrowser = async (agent) => {
 				if (!agent) return void 0;
@@ -4723,14 +4975,15 @@ async function createHonoServer(mastra, options = { tools: {} }) {
 		hasSession: false,
 		screencastAvailable: false
 	}));
-	if (server?.cors === false) app.use("*", timeout(server?.timeout ?? 180 * 1e3));
+	if (server?.cors === false) app.use("*", timeout(server?.timeout ?? 18e4));
 	else {
 		const hasAuth = !!server?.auth;
-		app.use("*", timeout(server?.timeout ?? 180 * 1e3), async (c, next) => {
+		app.use("*", timeout(server?.timeout ?? 18e4), async (c, next) => {
 			const pathname = new URL(c.req.url).pathname;
 			const method = c.req.method === "OPTIONS" ? c.req.header("Access-Control-Request-Method") ?? c.req.method : c.req.method;
 			const routeCors = getRouteCorsConfig(processedRoutes, pathname, method);
-			return cors(routeCors ? getCorsConfig(routeCors, false) : getCorsConfig(server?.cors, hasAuth))(c, next);
+			const corsOptions = routeCors ? getCorsConfig(routeCors, false) : getCorsConfig(server?.cors, hasAuth);
+			return cors(corsOptions)(c, next);
 		});
 	}
 	app.get("/health", describeRoute({
@@ -4813,7 +5066,8 @@ async function createHonoServer(mastra, options = { tools: {} }) {
 		if (requestPath.includes(".") && !requestPath.endsWith(".html")) return await next();
 		const isStudioRoute = studioBasePath === "" || requestPath === studioBasePath || requestPath.startsWith(`${studioBasePath}/`);
 		if (options?.studio && isStudioRoute) {
-			let indexHtml = await readFile(join(getStudioPath(), "index.html"), "utf-8");
+			const studioPath = getStudioPath();
+			let indexHtml = await readFile(join(studioPath, "index.html"), "utf-8");
 			const port = serverOptions?.port ?? (Number(process.env.PORT) || 4111);
 			const hideCloudCta = process.env.MASTRA_HIDE_CLOUD_CTA === "true";
 			const host = serverOptions?.host ?? process.env.MASTRA_HOST ?? "localhost";