@mastra/platform-workspace 1.3.0 → 1.4.0

package/dist/index.js

@@ -1,6 +1,7 @@
 import { Buffer } from "buffer";
 import nodePath from "path";
 import { FileExistsError, FileNotFoundError, MastraFilesystem, MastraSandbox, ProcessHandle, SandboxNotReadyError, SandboxProcessManager, UnsupportedStdinCloseError, WorkspaceReadOnlyError } from "@mastra/core/workspace";
+import { CommandExitError, Sandbox, TimeoutError } from "e2b";
 //#region src/client.ts
 const DEFAULT_PROXY_URL = "https://workspaces.mastra.ai";
 /**
@@ -13,12 +14,20 @@ function requireOption(value, name) {
 	if (!value) throw new Error(`${name} is required`);
 	return value;
 }
+function resolveSandboxProvider(value) {
+	const provider = value?.trim() || "railway";
+	if (provider !== "railway" && provider !== "e2b") throw new Error("SANDBOX_PROVIDER must be either \"railway\" or \"e2b\"");
+	return provider;
+}
 function resolvePlatformOptions(options) {
+	const configuredSandboxProvider = process.env.SANDBOX_PROVIDER?.trim();
 	return {
 		accessToken: requireOption(options.accessToken ?? process.env.MASTRA_PLATFORM_ACCESS_TOKEN, "accessToken"),
 		projectId: requireOption(options.projectId ?? process.env.MASTRA_PROJECT_ID, "projectId"),
 		actingUserId: options.actingUserId?.trim() || void 0,
 		proxyUrl: (process.env.MASTRA_WORKSPACE_PROXY_URL ?? DEFAULT_PROXY_URL).replace(/\/$/, ""),
+		sandboxProvider: resolveSandboxProvider(configuredSandboxProvider),
+		useLegacyRoutes: !configuredSandboxProvider,
 		sessionId: options.sessionId,
 		threadId: options.threadId,
 		fetch: options.fetch ?? fetch
@@ -65,6 +74,8 @@ var PlatformClient = class {
 	projectId;
 	actingUserId;
 	proxyUrl;
+	sandboxProvider;
+	useLegacyRoutes;
 	/** Advisory session correlation id — see {@link PlatformClientOptions.sessionId}. */
 	sessionId;
 	/** Advisory thread correlation id — see {@link PlatformClientOptions.threadId}. */
@@ -76,12 +87,15 @@ var PlatformClient = class {
 		this.projectId = resolved.projectId;
 		this.actingUserId = resolved.actingUserId;
 		this.proxyUrl = resolved.proxyUrl;
+		this.sandboxProvider = resolved.sandboxProvider;
+		this.useLegacyRoutes = resolved.useLegacyRoutes;
 		this.sessionId = resolved.sessionId;
 		this.threadId = resolved.threadId;
 		this.fetch = resolved.fetch;
 	}
 	async request(path, options = {}) {
-		const url = new URL(`${this.proxyUrl}/v1/projects/${encodeURIComponent(this.projectId)}${path}`);
+		const providerPath = this.useLegacyRoutes ? "" : `/${this.sandboxProvider}`;
+		const url = new URL(`${this.proxyUrl}/v1${providerPath}/projects/${encodeURIComponent(this.projectId)}${path}`);
 		for (const [key, value] of Object.entries(options.query ?? {})) if (value !== void 0) url.searchParams.set(key, String(value));
 		const headers = new Headers(options.headers);
 		headers.set("authorization", `Bearer ${this.accessToken}`);
@@ -502,6 +516,62 @@ function execViaLease(lease, options) {
 	});
 }
 //#endregion
+//#region src/e2b-exec.ts
+const E2B_ENVD_VERSION = "0.4.0";
+const execViaE2BLease = async (lease, options) => {
+	const stdoutChunks = [];
+	const stderrChunks = [];
+	const onStdout = (data) => {
+		stdoutChunks.push(data);
+		options.onStdout?.(data);
+	};
+	const onStderr = (data) => {
+		stderrChunks.push(data);
+		options.onStderr?.(data);
+	};
+	try {
+		const result = await new Sandbox({
+			sandboxId: lease.sandboxId,
+			envdVersion: E2B_ENVD_VERSION,
+			envdAccessToken: lease.jwt,
+			sandboxUrl: lease.wsEndpoint,
+			validateApiKey: false
+		}).commands.run(options.command, {
+			cwd: options.cwd,
+			envs: options.env,
+			timeoutMs: options.timeoutMs,
+			onStdout,
+			onStderr
+		});
+		return {
+			exitCode: result.exitCode,
+			stdout: result.stdout,
+			stderr: result.stderr,
+			truncated: false,
+			timedOut: false,
+			opened: true
+		};
+	} catch (error) {
+		if (error instanceof CommandExitError) return {
+			exitCode: error.exitCode,
+			stdout: error.stdout,
+			stderr: error.stderr,
+			truncated: false,
+			timedOut: false,
+			opened: true
+		};
+		return {
+			exitCode: null,
+			stdout: stdoutChunks.join(""),
+			stderr: stderrChunks.join(""),
+			truncated: false,
+			timedOut: error instanceof TimeoutError,
+			closeReason: error instanceof Error ? error.message : String(error),
+			opened: true
+		};
+	}
+};
+//#endregion
 //#region src/private-net-exec.ts
 /**
 * Thrown by {@link execViaPrivateNetwork} when the sidecar returns a non-2xx
@@ -843,6 +913,7 @@ var PlatformSandbox = class PlatformSandbox extends MastraSandbox {
 	_instructionsOverride;
 	_createdAt = null;
 	_webSocketFactory;
+	_e2bExecRunner;
 	_privateNetFetch;
 	/**
 	* Registry that maps `sandboxId → instanceUrl` for the private-network
@@ -940,6 +1011,7 @@ var PlatformSandbox = class PlatformSandbox extends MastraSandbox {
 		this._timeout = options.timeout;
 		this._instructionsOverride = options.instructions;
 		this._webSocketFactory = options.webSocketFactory;
+		this._e2bExecRunner = options.e2bExecRunner ?? execViaE2BLease;
 		this._privateNetFetch = options.privateNetFetch;
 		this._addressRegistry = options.addressRegistry;
 	}
@@ -960,6 +1032,7 @@ var PlatformSandbox = class PlatformSandbox extends MastraSandbox {
 	*/
 	clone(options = {}) {
 		const id = options.id ?? options.checkpointName;
+		const seedCheckpointName = options.seedCheckpointName ?? (this._client.sandboxProvider === "e2b" ? options.checkpointName : void 0) ?? this._seedCheckpointName;
 		return new PlatformSandbox({
 			...id !== void 0 && { id },
 			accessToken: this._client.accessToken,
@@ -970,13 +1043,14 @@ var PlatformSandbox = class PlatformSandbox extends MastraSandbox {
 			fetch: this._client.fetch,
 			environmentId: this._environmentId,
 			...options.sandboxId !== void 0 && { sandboxId: options.sandboxId },
-			...(options.seedCheckpointName ?? this._seedCheckpointName) !== void 0 && { seedCheckpointName: options.seedCheckpointName ?? this._seedCheckpointName },
+			...seedCheckpointName !== void 0 && { seedCheckpointName },
 			idleTimeoutMinutes: options.idleTimeoutMinutes ?? this._idleTimeoutMinutes,
 			...this._networkIsolation !== void 0 && { networkIsolation: this._networkIsolation },
 			env: options.env ?? this._env,
 			...this._timeout !== void 0 && { timeout: this._timeout },
 			...this._instructionsOverride !== void 0 && { instructions: this._instructionsOverride },
 			...this._webSocketFactory !== void 0 && { webSocketFactory: this._webSocketFactory },
+			e2bExecRunner: this._e2bExecRunner,
 			...this._privateNetFetch !== void 0 && { privateNetFetch: this._privateNetFetch },
 			...this._addressRegistry !== void 0 && { addressRegistry: this._addressRegistry }
 		});
@@ -1177,7 +1251,7 @@ var PlatformSandbox = class PlatformSandbox extends MastraSandbox {
 	* it. Any in-flight capture is awaited first so the preserved checkpoint
 	* reflects the latest disk state we asked for.
 	*
-	* Corresponds to `DELETE /v1/projects/:pid/sandbox/:sandboxId` on
+	* Corresponds to `DELETE /v1/:provider/projects/:pid/sandbox/:sandboxId` on
 	* workspace-proxy, which by contract does not touch the checkpoint. Use
 	* {@link destroy} when you want the checkpoint released too.
 	*/
@@ -1198,15 +1272,15 @@ var PlatformSandbox = class PlatformSandbox extends MastraSandbox {
 	* transient proxy error must not leave the caller with a half-torn-down
 	* sandbox they can't safely retry.
 	*
-	* Requires the caller to have constructed with a recovery `id` (there is
-	* no checkpoint to delete otherwise); callers without one skip the
-	* checkpoint DELETE and behave identically to {@link stop}.
+	* Railway requires a caller-supplied recovery `id` before it can have a
+	* checkpoint to delete. E2B also permits capture with the automatic id, so
+	* destroy releases that named snapshot even when no recovery id was supplied.
 	*/
 	async destroy() {
 		if (!this._sandboxId) return;
 		const destroyedSandboxId = this._sandboxId;
 		this._captureInFlight = null;
-		if (this._hasRecoveryKey) try {
+		if (this._hasRecoveryKey || this._client.sandboxProvider === "e2b") try {
 			await this._client.request(`/sandbox/${encodeURIComponent(destroyedSandboxId)}/checkpoint`, {
 				method: "DELETE",
 				headers: { "content-type": "application/json" },
@@ -1289,7 +1363,7 @@ var PlatformSandbox = class PlatformSandbox extends MastraSandbox {
 	* to a skip as described above.
 	*/
 	async captureCheckpoint() {
-		if (!this._hasRecoveryKey) {
+		if (!this._hasRecoveryKey && this._client.sandboxProvider !== "e2b") {
 			this.logger.debug(`captureCheckpoint skipped: no recovery key configured for sandbox ${this._sandboxId ?? "(unstarted)"}`);
 			return {
 				status: "skipped",
@@ -1472,13 +1546,14 @@ var PlatformSandbox = class PlatformSandbox extends MastraSandbox {
 			}
 			lastLease = lease;
 			attemptsMade = attempt + 1;
-			const result = await execViaLease(lease, {
+			const execOptions = {
 				command: fullCommand,
 				...options?.cwd !== void 0 && { cwd: options.cwd },
 				...filteredEnv !== void 0 && { env: filteredEnv },
 				...effectiveTimeout != null && effectiveTimeout > 0 && { timeoutMs: effectiveTimeout },
 				...this._webSocketFactory && { webSocketFactory: this._webSocketFactory }
-			});
+			};
+			const result = lease.provider === "e2b" ? await this._e2bExecRunner(lease, execOptions) : await execViaLease(lease, execOptions);
 			lastResult = result;
 			if (result.exitCode !== null || result.timedOut) return result;
 		}
@@ -1561,6 +1636,9 @@ var PlatformSandbox = class PlatformSandbox extends MastraSandbox {
 			const json = await (await this._client.request(`/sandbox/${encodeURIComponent(sandboxId)}/exec-lease`, { method: "POST" })).json();
 			const expiresAtMs = json.expiresAt ? Date.parse(json.expiresAt) : null;
 			const lease = {
+				provider: json.provider,
+				sandboxId: json.sandboxId,
+				providerResourceId: json.providerResourceId,
 				jwt: json.jwt,
 				wsEndpoint: json.wsEndpoint,
 				subprotocol: json.subprotocol,