@mastra/daytona 0.8.0 → 0.9.0-alpha.1

package/dist/index.js

@@ -524,7 +524,7 @@ var DaytonaProcessManager = class extends SandboxProcessManager {
 	_spawnCounter = 0;
 	_defaultTimeout;
 	constructor(opts = {}) {
-		super({ env: opts.env });
+		super();
 		this._defaultTimeout = opts.defaultTimeout;
 	}
 	async spawn(command, options = {}) {
@@ -533,11 +533,7 @@ var DaytonaProcessManager = class extends SandboxProcessManager {
 			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;
@@ -696,7 +692,6 @@ var DaytonaSandbox = class DaytonaSandbox extends MastraSandbox {
 	timeout;
 	language;
 	resources;
-	env;
 	labels;
 	snapshotId;
 	image;
@@ -712,22 +707,19 @@ var DaytonaSandbox = class DaytonaSandbox extends MastraSandbox {
 	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;
@@ -742,6 +734,7 @@ var DaytonaSandbox = class DaytonaSandbox extends MastraSandbox {
 		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 },
@@ -799,26 +792,35 @@ var DaytonaSandbox = class DaytonaSandbox extends MastraSandbox {
 		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 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 !== 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 Daytona(this.connectionOpts);
 		this.logger.debug(`${LOG_PREFIX} Creating sandbox for: ${this.id}`);
 		const baseParams = compact({
 			language: this.language,
@@ -836,7 +838,8 @@ var DaytonaSandbox = class DaytonaSandbox extends MastraSandbox {
 			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({
@@ -941,18 +944,6 @@ var DaytonaSandbox = class DaytonaSandbox extends MastraSandbox {
 		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) {
@@ -1323,10 +1314,6 @@ var DaytonaSandbox = class DaytonaSandbox extends MastraSandbox {
 			} catch {}
 			return null;
 		}
-		if (state !== SandboxState.STARTED) {
-			this.logger.debug(`${LOG_PREFIX} Restarting sandbox ${sandbox.id} (state: ${state})`);
-			await this.waitForStableStateAndStart(sandbox);
-		}
 		return sandbox;
 	}
 	/**