@mastra/daytona 0.8.0 → 0.9.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,63 @@
 # @mastra/daytona
 
+## 0.9.0-alpha.1
+
+### Minor Changes
+
+- Added a `secrets` option to `DaytonaSandbox` for injecting Daytona Secrets into sandboxes. Map environment variable names to Daytona Secret names and the real value is substituted into HTTPS request headers at egress — the raw credential never enters the sandbox. ([#22322](https://github.com/mastra-ai/mastra/pull/22322))
+
+  ```typescript
+  const sandbox = new DaytonaSandbox({
+    secrets: {
+      GITHUB_TOKEN: 'github-token',
+    },
+  });
+  ```
+
+  Closes https://github.com/mastra-ai/mastra/issues/22314
+
+### Patch Changes
+
+- Fixed a leak where every command left its process handle behind, by removing Daytona's own `executeCommand` in favour of the shared one, which releases them. ([#21984](https://github.com/mastra-ai/mastra/pull/21984))
+
+  Command results now match every other provider: `command` holds the full command string, and the separate `args` array is gone.
+
+  ```typescript
+  const result = await sandbox.executeCommand('echo', ['hello']);
+  // before: result.command === 'echo',       result.args === ['hello']
+  // after:  result.command === 'echo hello', result.args === undefined
+  ```
+
+- Starting a sandbox now reports whether it created a fresh sandbox or reconnected to an existing one, so an `onStart` handler can run first-time setup only when it's actually needed: ([#21984](https://github.com/mastra-ai/mastra/pull/21984))
+
+  ```typescript
+  new E2BSandbox({
+    id: 'session-1',
+    onStart: async ({ outcome }) => {
+      if (outcome === 'created') await cloneRepo();
+    },
+  });
+  ```
+
+- Updated dependencies [[`4ff3ee2`](https://github.com/mastra-ai/mastra/commit/4ff3ee2bff7ed07528b4817f8f49639031c72a4d), [`c24754c`](https://github.com/mastra-ai/mastra/commit/c24754c1fb6fe144e5051e536e98c8a18b0214ac), [`45dd6ee`](https://github.com/mastra-ai/mastra/commit/45dd6ee089bd7df0d0c98a10098e483fd388e04a), [`32d3583`](https://github.com/mastra-ai/mastra/commit/32d358332cb8ac2306b83b73cf3536e74dbd435e), [`aca2869`](https://github.com/mastra-ai/mastra/commit/aca2869b2031982f3c4a2f52525c9be7cf123ef8)]:
+  - @mastra/core@1.62.0-alpha.11
+
+## 0.8.1-alpha.0
+
+### Patch Changes
+
+- Honor the sandbox runtime environment (`setEnv()`/`getEnv()` from `@mastra/core`) in every workspace sandbox provider. Environment variables set after construction now reach subsequent commands on all providers: ([#22250](https://github.com/mastra-ai/mastra/pull/22250))
+
+  - Process-manager-routed providers (E2B, Blaxel, Cloudflare, Daytona, Docker, Modal, Vercel microVM spawns) inherit the merge from the core spawn wrapper; their duplicated per-manager env plumbing is removed.
+  - Providers with their own exec transports (AgentCore, Apple Container, Railway, Vercel microVM and serverless `executeCommand`, Platform's private-network, WebSocket lease, and E2B lease paths) now merge `getEnv()` under per-call env.
+
+  Constructor `env` continues to behave as before: it seeds the sandbox runtime environment, and providers that bake env into the VM or container at creation time (Docker, Modal, Railway, Apple Container, Vercel, Platform) still do so. Per-call `env` on `executeCommand` still takes precedence for that command only.
+
+  Removed exported types (minor bump for these two packages): `BlaxelProcessManagerOptions` from `@mastra/blaxel` and `RailwayProcessManagerOptions` from `@mastra/railway`. Both existed only to pass `env` into a process manager constructed by hand; the core spawn wrapper now owns that merge, so the option and its type are gone.
+
+- Updated dependencies [[`aa3a85d`](https://github.com/mastra-ai/mastra/commit/aa3a85daf094c683bb97efdf4b6a696d2e474af5), [`d29d06f`](https://github.com/mastra-ai/mastra/commit/d29d06fe00bbd35b4571150ea04c59d2ed783c71), [`e6516df`](https://github.com/mastra-ai/mastra/commit/e6516dfcdae4f4ac0e7971d84359a81385ee602f), [`0b2a3d1`](https://github.com/mastra-ai/mastra/commit/0b2a3d1783875c5b97b7b36ab3d03d7360e0dde7), [`6bb5d71`](https://github.com/mastra-ai/mastra/commit/6bb5d7193fe9166b219f0fccae17db7a5ae86e65), [`57de7d6`](https://github.com/mastra-ai/mastra/commit/57de7d644ba7146edb4e9e6111ec4fa98c3a59e9), [`e8e299c`](https://github.com/mastra-ai/mastra/commit/e8e299cc6abdfc39947e2fec25803493015d3882), [`edfc548`](https://github.com/mastra-ai/mastra/commit/edfc548886bc7bae17b681f8b6b41a47eb32bcd2), [`a8a4871`](https://github.com/mastra-ai/mastra/commit/a8a4871215f51da95c47129602157ce5372f634a), [`5165cdc`](https://github.com/mastra-ai/mastra/commit/5165cdcdcf50e144bb8113278535196cc9b07065), [`6bb5d71`](https://github.com/mastra-ai/mastra/commit/6bb5d7193fe9166b219f0fccae17db7a5ae86e65), [`9ee8120`](https://github.com/mastra-ai/mastra/commit/9ee8120ce17f76b9f617489e05a283353742690a), [`d975e92`](https://github.com/mastra-ai/mastra/commit/d975e924d4936f46c386bd3dee39c671720289f6), [`1cfa878`](https://github.com/mastra-ai/mastra/commit/1cfa8784d8da0dfaa0317e5048bc48b6084a5ea5), [`c118318`](https://github.com/mastra-ai/mastra/commit/c1183181c9804303db4b511c2e2648f8b714712b), [`fc07c64`](https://github.com/mastra-ai/mastra/commit/fc07c6465043e08e99193a6751a01c56ffc2e7a1), [`542dee2`](https://github.com/mastra-ai/mastra/commit/542dee254167f974ff8cbbbfc0ce10f9a2616a7b), [`a58483c`](https://github.com/mastra-ai/mastra/commit/a58483cff1a9d41fce7c931843f48cb0ac450f64), [`a58483c`](https://github.com/mastra-ai/mastra/commit/a58483cff1a9d41fce7c931843f48cb0ac450f64), [`895e9df`](https://github.com/mastra-ai/mastra/commit/895e9dfc17d6f34299eca64e317ded9e5f5e5ef8)]:
+  - @mastra/core@1.62.0-alpha.8
+
 ## 0.8.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -525,7 +525,7 @@ var DaytonaProcessManager = class extends _mastra_core_workspace.SandboxProcessM
 	_spawnCounter = 0;
 	_defaultTimeout;
 	constructor(opts = {}) {
-		super({ env: opts.env });
+		super();
 		this._defaultTimeout = opts.defaultTimeout;
 	}
 	async spawn(command, options = {}) {
@@ -534,11 +534,7 @@ var DaytonaProcessManager = class extends _mastra_core_workspace.SandboxProcessM
 			timeout: options.timeout ?? this._defaultTimeout,
 			cwd: options.cwd ?? this.sandbox.mounts?.entries?.keys().next().value
 		};
-		const mergedEnv = {
-			...this.env,
-			...effectiveOptions.env
-		};
-		const envs = Object.fromEntries(Object.entries(mergedEnv).filter((entry) => entry[1] !== void 0));
+		const envs = Object.fromEntries(Object.entries(effectiveOptions.env ?? {}).filter((entry) => entry[1] !== void 0));
 		const sessionCommand = buildSpawnCommand(command, effectiveOptions.cwd, envs);
 		return this.sandbox.retryOnDead(async () => {
 			const sandbox = this.sandbox.daytona;
@@ -697,7 +693,6 @@ var DaytonaSandbox = class DaytonaSandbox extends _mastra_core_workspace.MastraS
 	timeout;
 	language;
 	resources;
-	env;
 	labels;
 	snapshotId;
 	image;
@@ -713,22 +708,19 @@ var DaytonaSandbox = class DaytonaSandbox extends _mastra_core_workspace.MastraS
 	networkBlockAll;
 	networkAllowList;
 	domainAllowList;
+	secrets;
 	connectionOpts;
 	_constructorOptions;
 	constructor(options = {}) {
 		super({
 			...options,
 			name: "DaytonaSandbox",
-			processes: new DaytonaProcessManager({
-				env: options.env,
-				defaultTimeout: options.timeout ?? 3e5
-			})
+			processes: new DaytonaProcessManager({ defaultTimeout: options.timeout ?? 3e5 })
 		});
 		this.id = options.id ?? this.generateId();
 		this.timeout = options.timeout ?? 3e5;
 		this.language = options.language ?? "typescript";
 		this.resources = options.resources;
-		this.env = options.env ?? {};
 		this.labels = options.labels ?? {};
 		this.snapshotId = options.snapshot;
 		this.image = options.image;
@@ -743,6 +735,7 @@ var DaytonaSandbox = class DaytonaSandbox extends _mastra_core_workspace.MastraS
 		this.networkBlockAll = options.networkBlockAll;
 		this.networkAllowList = options.networkAllowList;
 		this.domainAllowList = options.domainAllowList;
+		this.secrets = options.secrets;
 		this.connectionOpts = {
 			...options.apiKey !== void 0 && { apiKey: options.apiKey },
 			...options.apiUrl !== void 0 && { apiUrl: options.apiUrl },
@@ -800,26 +793,35 @@ var DaytonaSandbox = class DaytonaSandbox extends _mastra_core_workspace.MastraS
 		return this.daytona;
 	}
 	/**
-	* Start the Daytona sandbox.
-	* Reconnects to an existing sandbox with the same logical ID if one exists,
-	* otherwise creates a new sandbox instance.
+	* Acquisition primitives (base-orchestrated start): the base derives
+	* `created` structurally from whether an existing sandbox was found, so
+	* reconnecting to one with the same logical ID reports `connected`.
+	* Lookup errors other than not-found propagate deliberately — creating a
+	* duplicate sandbox on a transient/auth error would be worse than failing.
 	*/
-	async start() {
-		if (this._sandbox) return;
+	async find() {
+		if (this._sandbox) return this._sandbox;
 		if (!this._daytona) this._daytona = new _daytonaio_sdk.Daytona(this.connectionOpts);
-		const existing = await this.findExistingSandbox();
-		if (existing) {
-			this._sandbox = existing;
-			this._daytonaSandboxId = existing.id;
-			this._createdAt = existing.createdAt ? new Date(existing.createdAt) : /* @__PURE__ */ new Date();
-			this.logger.debug(`${LOG_PREFIX} Reconnected to existing sandbox ${existing.id} for: ${this.id}`);
-			const expectedPaths = Array.from(this.mounts.entries.keys());
-			this.logger.debug(`${LOG_PREFIX} Running mount reconciliation...`);
-			await this.reconcileMounts(expectedPaths);
-			this.logger.debug(`${LOG_PREFIX} Mount reconciliation complete`);
-			await this.detectWorkingDir();
-			return;
+		return await this.findExistingSandbox() ?? void 0;
+	}
+	async connect(existing) {
+		if (existing === this._sandbox) return;
+		if (existing.state !== _daytonaio_sdk.SandboxState.STARTED) {
+			this.logger.debug(`${LOG_PREFIX} Restarting sandbox ${existing.id} (state: ${existing.state})`);
+			await this.waitForStableStateAndStart(existing);
 		}
+		this._sandbox = existing;
+		this._daytonaSandboxId = existing.id;
+		this._createdAt = existing.createdAt ? new Date(existing.createdAt) : /* @__PURE__ */ new Date();
+		this.logger.debug(`${LOG_PREFIX} Reconnected to existing sandbox ${existing.id} for: ${this.id}`);
+		const expectedPaths = Array.from(this.mounts.entries.keys());
+		this.logger.debug(`${LOG_PREFIX} Running mount reconciliation...`);
+		await this.reconcileMounts(expectedPaths);
+		this.logger.debug(`${LOG_PREFIX} Mount reconciliation complete`);
+		await this.detectWorkingDir();
+	}
+	async create() {
+		if (!this._daytona) this._daytona = new _daytonaio_sdk.Daytona(this.connectionOpts);
 		this.logger.debug(`${LOG_PREFIX} Creating sandbox for: ${this.id}`);
 		const baseParams = compact({
 			language: this.language,
@@ -837,7 +839,8 @@ var DaytonaSandbox = class DaytonaSandbox extends _mastra_core_workspace.MastraS
 			public: this.sandboxPublic,
 			networkBlockAll: this.networkBlockAll,
 			networkAllowList: this.networkAllowList,
-			domainAllowList: this.domainAllowList
+			domainAllowList: this.domainAllowList,
+			secrets: this.secrets
 		});
 		if (this.resources && !this.image) this.logger.warn(`${LOG_PREFIX} 'resources' option requires 'image' to take effect — falling back to snapshot-based creation without custom resources`);
 		const createParams = this.image && !this.snapshotId ? compact({
@@ -942,18 +945,6 @@ var DaytonaSandbox = class DaytonaSandbox extends _mastra_core_workspace.MastraS
 		return parts.join(" ");
 	}
 	/**
-	* Execute a command in the sandbox and return the result.
-	*/
-	async executeCommand(command, args = [], options = {}) {
-		await this.ensureRunning();
-		const fullCommand = args.length > 0 ? `${command} ${args.map(shellQuote).join(" ")}` : command;
-		return {
-			...await (await this.processes.spawn(fullCommand, options)).wait(),
-			command,
-			args
-		};
-	}
-	/**
 	* Bulk-write files into the sandbox filesystem via the SDK's native upload.
 	*/
 	async writeFiles(files) {
@@ -1324,10 +1315,6 @@ var DaytonaSandbox = class DaytonaSandbox extends _mastra_core_workspace.MastraS
 			} catch {}
 			return null;
 		}
-		if (state !== _daytonaio_sdk.SandboxState.STARTED) {
-			this.logger.debug(`${LOG_PREFIX} Restarting sandbox ${sandbox.id} (state: ${state})`);
-			await this.waitForStableStateAndStart(sandbox);
-		}
 		return sandbox;
 	}
 	/**