sandbox 3.0.0-beta.5 → 3.0.0-beta.7

package/dist/{app-BvyZgr9h.mjs → app-CZIqoxxn.mjs}

@@ -7427,7 +7427,7 @@ const scope = {
 
 //#endregion
 //#region package.json
-var version = "3.0.0-beta.5";
+var version = "3.0.0-beta.7";
 
 //#endregion
 //#region src/error.ts
@@ -11251,16 +11251,23 @@ var import_ms$3 = /* @__PURE__ */ __toESM(require_ms());
 const debug$2 = createDebugger("sandbox:timeout");
 const BUFFER = (0, import_ms$3.default)("10 seconds");
 async function extendSandboxTimeoutPeriodically(sandbox, signal) {
-	const nextTick = sandbox.createdAt.getTime() + sandbox.timeout;
+	const session = sandbox.currentSession();
+	const timeout$1 = session.timeout;
+	if (timeout$1 == null) return;
+	const nextTick = session.createdAt.getTime() + timeout$1;
 	debug$2(`next tick: ${new Date(nextTick).toISOString()}`);
 	while (!signal.aborted) {
-		const timeout$1 = sandbox.createdAt.getTime() + sandbox.timeout - Date.now() - BUFFER;
-		if (timeout$1 > 2e3) {
-			debug$2(`sleeping for ${timeout$1}ms until next timeout extension`);
-			await setTimeout$1(timeout$1, null, { signal });
+		const currentTimeout = session.timeout;
+		if (currentTimeout == null) return;
+		const sleepMs = session.createdAt.getTime() + currentTimeout - Date.now() - BUFFER;
+		if (sleepMs > 2e3) {
+			debug$2(`sleeping for ${sleepMs}ms until next timeout extension`);
+			await setTimeout$1(sleepMs, null, { signal });
 		}
 		await sandbox.extendTimeout((0, import_ms$3.default)("5 minutes"));
-		const nextTick$1 = sandbox.createdAt.getTime() + sandbox.timeout;
+		const updatedTimeout = session.timeout;
+		if (updatedTimeout == null) return;
+		const nextTick$1 = session.createdAt.getTime() + updatedTimeout;
 		debug$2(`extended sandbox timeout by 5 minutes. next tick: ${new Date(nextTick$1).toISOString()}`);
 	}
 }
@@ -11388,11 +11395,16 @@ async function startInteractiveShell(options) {
 		await setupSandboxEnvironment(options.sandbox, progress);
 		progress.text = "Booting up interactive listener...";
 		command$1 = await startServerCommand(options.sandbox, listener, options.execution, options.sudo, options.envVars, options.cwd);
+		debug$1("startServerCommand completed, cmdId=%s, interactivePort=%s", command$1.cmdId, options.sandbox.interactivePort);
 		const waitForProcess = _usingCtx3.u(createAbortController("Connection established successfully"));
 		listener.connection.then(() => {
+			debug$1("listener.connection resolved");
 			waitForProcess.abort();
 		});
-		connect$1(command$1, listener, waitForProcess.signal).catch(waitForProcess.ignoreInterruptions);
+		connect$1(command$1, listener, waitForProcess.signal).catch((err$1) => {
+			if (waitForProcess.signal.aborted) return;
+			listener.stdoutStream.destroy(err$1 instanceof Error ? err$1 : new Error(String(err$1)));
+		});
 		await Promise.all([throwIfCommandPrematurelyExited(command$1, waitForProcess.signal), attach({
 			sandbox: options.sandbox,
 			progress,
@@ -11495,6 +11507,7 @@ async function connect$1(command$1, listener, signal) {
 		const stderrStream = _usingCtx5.u(getStderrStream());
 		for await (const chunk of logs) if (chunk.stream === "stdout") listener.stdoutStream.write(chunk.data);
 		else stderrStream.write(chunk.data);
+		listener.stdoutStream.end();
 	} catch (_) {
 		_usingCtx5.e = _;
 	} finally {
@@ -11767,6 +11780,12 @@ const args$2 = {
 		type: ObjectFromKeyValue,
 		description: "Default environment variables for sandbox commands"
 	}),
+	tags: import_cjs$14.multioption({
+		long: "tag",
+		short: "t",
+		type: ObjectFromKeyValue,
+		description: "Key-value tags to associate with the sandbox (e.g. --tag env=staging)"
+	}),
 	...networkPolicyArgs,
 	scope
 };
@@ -11778,7 +11797,7 @@ const create = import_cjs$14.command({
 		description: "Create and connect to a sandbox without a network access",
 		command: `sandbox run --network-policy=none --connect`
 	}],
-	async handler({ name, nonPersistent, ports, scope: scope$1, runtime: runtime$1, timeout: timeout$1, vcpus: vcpus$1, silent, snapshot: snapshot$1, connect: connect$2, envVars, networkPolicy: networkPolicyMode$1, allowedDomains: allowedDomains$1, allowedCIDRs: allowedCIDRs$1, deniedCIDRs: deniedCIDRs$1 }) {
+	async handler({ name, nonPersistent, ports, scope: scope$1, runtime: runtime$1, timeout: timeout$1, vcpus: vcpus$1, silent, snapshot: snapshot$1, connect: connect$2, envVars, tags, networkPolicy: networkPolicyMode$1, allowedDomains: allowedDomains$1, allowedCIDRs: allowedCIDRs$1, deniedCIDRs: deniedCIDRs$1 }) {
 		const networkPolicy$1 = buildNetworkPolicy({
 			networkPolicy: networkPolicyMode$1,
 			allowedDomains: allowedDomains$1,
@@ -11787,6 +11806,7 @@ const create = import_cjs$14.command({
 		});
 		const persistent = !nonPersistent;
 		const resources = vcpus$1 ? { vcpus: vcpus$1 } : void 0;
+		const tagsObj = Object.keys(tags).length > 0 ? tags : void 0;
 		const spinner = silent ? void 0 : ora("Creating sandbox...").start();
 		const sandbox = snapshot$1 ? await sandboxClient.create({
 			name,
@@ -11802,6 +11822,7 @@ const create = import_cjs$14.command({
 			resources,
 			networkPolicy: networkPolicy$1,
 			env: envVars,
+			tags: tagsObj,
 			persistent,
 			__interactive: true
 		}) : await sandboxClient.create({
@@ -11815,6 +11836,7 @@ const create = import_cjs$14.command({
 			resources,
 			networkPolicy: networkPolicy$1,
 			env: envVars,
+			tags: tagsObj,
 			persistent,
 			__interactive: true
 		});
@@ -11945,22 +11967,27 @@ const list = import_cjs$12.command({
 			description: "Sort sandboxes by field. Options: createdAt (default), name",
 			type: import_cjs$12.optional(import_cjs$12.oneOf(["createdAt", "name"]))
 		}),
+		tags: import_cjs$12.multioption({
+			long: "tag",
+			description: "Filter sandboxes by tag. Format: \"key=value\"",
+			type: ObjectFromKeyValue
+		}),
 		scope
 	},
-	async handler({ scope: { token: token$1, team: team$1, project: project$1 }, all, namePrefix, sortBy }) {
+	async handler({ scope: { token: token$1, team: team$1, project: project$1 }, all, namePrefix, sortBy, tags }) {
 		const sandboxes = await (async () => {
 			try {
 				var _usingCtx$1 = _usingCtx();
 				const _spinner$1 = _usingCtx$1.u(acquireRelease(() => ora("Fetching sandboxes...").start(), (s$1) => s$1.stop()));
-				const { json } = await sandboxClient.list({
+				let { sandboxes: sandboxes$1 } = await sandboxClient.list({
 					token: token$1,
 					teamId: team$1,
 					projectId: project$1,
 					limit: 100,
 					...namePrefix && { namePrefix },
-					...sortBy && { sortBy }
+					...sortBy && { sortBy },
+					...Object.keys(tags).length > 0 && { tags }
 				});
-				let sandboxes$1 = json.sandboxes;
 				if (!all) sandboxes$1 = sandboxes$1.filter((x) => x.status === "running");
 				return sandboxes$1;
 			} catch (_) {
@@ -11980,11 +12007,12 @@ const list = import_cjs$12.command({
 				color: (s$1) => SandboxStatusColor[s$1.status] ?? source_default.reset
 			},
 			CREATED: { value: (s$1) => timeAgo(s$1.createdAt) },
-			MEMORY: { value: (s$1) => memoryFormatter.format(s$1.memory) },
-			VCPUS: { value: (s$1) => s$1.vcpus },
-			RUNTIME: { value: (s$1) => s$1.runtime },
-			TIMEOUT: { value: (s$1) => timeAgo(s$1.createdAt + s$1.timeout) },
-			SNAPSHOT: { value: (s$1) => s$1.currentSnapshotId ?? "-" }
+			MEMORY: { value: (s$1) => s$1.memory != null ? memoryFormatter.format(s$1.memory) : "-" },
+			VCPUS: { value: (s$1) => s$1.vcpus ?? "-" },
+			RUNTIME: { value: (s$1) => s$1.runtime ?? "-" },
+			TIMEOUT: { value: (s$1) => s$1.timeout != null ? timeAgo(s$1.createdAt + s$1.timeout) : "-" },
+			SNAPSHOT: { value: (s$1) => s$1.currentSnapshotId ?? "-" },
+			TAGS: { value: (s$1) => s$1.tags && Object.keys(s$1.tags).length > 0 ? Object.entries(s$1.tags).map(([k, v]) => `${k}:${v}`).join(", ") : "-" }
 		};
 		if (all) {
 			columns.CPU = { value: (s$1) => s$1.totalActiveCpuDurationMs ? formatRunDuration(s$1.totalActiveCpuDurationMs) : "-" };
@@ -14326,9 +14354,9 @@ const stop = import_cjs$10.command({
 		scope
 	},
 	async handler({ scope: { token: token$1, team: team$1, project: project$1 }, sandboxName: sandboxName$1, sandboxNames }) {
-		await new Listr(Array.from(new Set([sandboxName$1, ...sandboxNames]), (sandboxName$2) => {
+		const tasks = Array.from(new Set([sandboxName$1, ...sandboxNames]), (sandboxName$2) => {
 			return {
-				title: `Stopping sandbox ${sandboxName$2}`,
+				title: `Stopping active session from ${sandboxName$2}`,
 				async task() {
 					await (await sandboxClient.get({
 						token: token$1,
@@ -14338,7 +14366,12 @@ const stop = import_cjs$10.command({
 					})).stop();
 				}
 			};
-		}), { concurrent: true }).run();
+		});
+		try {
+			await new Listr(tasks, { concurrent: true }).run();
+		} catch {
+			process.exitCode = 1;
+		}
 	}
 });
 
@@ -14358,14 +14391,10 @@ const remove = import_cjs$9.command({
 			type: sandboxName,
 			description: "more sandboxes to remove"
 		}),
-		preserveSnapshots: import_cjs$9.flag({
-			long: "preserve-snapshots",
-			description: "Keep snapshots when removing the sandbox"
-		}),
 		scope
 	},
-	async handler({ scope: { token: token$1, team: team$1, project: project$1 }, sandboxName: sandboxName$1, sandboxNames, preserveSnapshots }) {
-		await new Listr(Array.from(new Set([sandboxName$1, ...sandboxNames]), (name) => ({
+	async handler({ scope: { token: token$1, team: team$1, project: project$1 }, sandboxName: sandboxName$1, sandboxNames }) {
+		const tasks = Array.from(new Set([sandboxName$1, ...sandboxNames]), (name) => ({
 			title: `Removing sandbox ${name}`,
 			async task() {
 				await (await sandboxClient.get({
@@ -14373,9 +14402,14 @@ const remove = import_cjs$9.command({
 					teamId: team$1,
 					projectId: project$1,
 					name
-				})).delete({ preserveSnapshots });
+				})).delete();
 			}
-		})), { concurrent: true }).run();
+		}));
+		try {
+			await new Listr(tasks, { concurrent: true }).run();
+		} catch {
+			process.exitCode = 1;
+		}
 	}
 });
 
@@ -14557,14 +14591,14 @@ const list$2 = import_cjs$4.command({
 			try {
 				var _usingCtx$1 = _usingCtx();
 				const _spinner$1 = _usingCtx$1.u(acquireRelease(() => ora("Fetching snapshots...").start(), (s$1) => s$1.stop()));
-				const { json } = await snapshotClient.list({
+				const { snapshots: snapshots$2 } = await snapshotClient.list({
 					token: token$1,
 					teamId: team$1,
 					projectId: project$1,
 					name,
 					limit: 100
 				});
-				return json.snapshots;
+				return snapshots$2;
 			} catch (_) {
 				_usingCtx$1.e = _;
 			} finally {
@@ -14582,7 +14616,7 @@ const list$2 = import_cjs$4.command({
 				CREATED: { value: (s$1) => timeAgo(s$1.createdAt) },
 				EXPIRATION: { value: (s$1) => s$1.status === "deleted" ? source_default.gray.dim("deleted") : timeAgo(s$1.expiresAt) },
 				SIZE: { value: (s$1) => formatBytes(s$1.sizeBytes) },
-				["SOURCE SESSION"]: { value: (s$1) => s$1.sourceSandboxId }
+				["SOURCE SESSION"]: { value: (s$1) => s$1.sourceSessionId }
 			}
 		}));
 	}
@@ -14625,7 +14659,7 @@ const get = import_cjs$4.command({
 				CREATED: { value: (s$1) => timeAgo(s$1.createdAt) },
 				EXPIRATION: { value: (s$1) => s$1.status === "deleted" ? source_default.gray.dim("deleted") : timeAgo(s$1.expiresAt) },
 				SIZE: { value: (s$1) => formatBytes(s$1.sizeBytes) },
-				["SOURCE SESSION"]: { value: (s$1) => s$1.sourceSandboxId }
+				["SOURCE SESSION"]: { value: (s$1) => s$1.sourceSessionId }
 			}
 		}));
 	}
@@ -14646,7 +14680,7 @@ const remove$1 = import_cjs$4.command({
 		scope
 	},
 	async handler({ scope: { team: team$1, token: token$1, project: project$1 }, snapshotId: snapshotId$1, snapshotIds }) {
-		await new Listr(Array.from(new Set([snapshotId$1, ...snapshotIds]), (snapshotId$2) => {
+		const tasks = Array.from(new Set([snapshotId$1, ...snapshotIds]), (snapshotId$2) => {
 			return {
 				title: `Deleting snapshot ${snapshotId$2}`,
 				async task() {
@@ -14660,7 +14694,12 @@ const remove$1 = import_cjs$4.command({
 					await snapshot$1.delete();
 				}
 			};
-		}), { concurrent: true }).run();
+		});
+		try {
+			await new Listr(tasks, { concurrent: true }).run();
+		} catch {
+			process.exitCode = 1;
+		}
 	}
 });
 const snapshots = (0, import_cjs$5.subcommands)({
@@ -14688,20 +14727,25 @@ const list$1 = import_cjs$2.command({
 	aliases: ["ls"],
 	description: "List sessions from a sandbox",
 	args: {
+		all: import_cjs$2.flag({
+			long: "all",
+			short: "a",
+			description: "Show all sessions (default shows just running)"
+		}),
 		sandbox: import_cjs$2.positional({
 			type: sandboxName,
 			description: "Sandbox name to list sessions for"
 		}),
 		scope
 	},
-	async handler({ scope: { token: token$1, team: team$1, project: project$1 }, sandbox: name }) {
+	async handler({ scope: { token: token$1, team: team$1, project: project$1 }, all, sandbox: name }) {
 		const sandbox = await sandboxClient.get({
 			name,
 			projectId: project$1,
 			teamId: team$1,
 			token: token$1
 		});
-		const sessions$1 = (await (async () => {
+		let { sessions: sessions$1 } = await (async () => {
 			try {
 				var _usingCtx$1 = _usingCtx();
 				const _spinner$1 = _usingCtx$1.u(acquireRelease(() => ora("Fetching sessions...").start(), (s$1) => s$1.stop()));
@@ -14711,22 +14755,33 @@ const list$1 = import_cjs$2.command({
 			} finally {
 				_usingCtx$1.d();
 			}
-		})()).json.sandboxes;
+		})();
+		if (!all) sessions$1 = sessions$1.filter((x) => x.status === "running");
+		const memoryFormatter = new Intl.NumberFormat(void 0, {
+			style: "unit",
+			unit: "megabyte"
+		});
+		const columns = {
+			ID: { value: (s$1) => s$1.id },
+			STATUS: {
+				value: (s$1) => s$1.status,
+				color: (s$1) => SessionStatusColor[s$1.status] ?? source_default.reset
+			},
+			CREATED: { value: (s$1) => timeAgo(s$1.createdAt) },
+			MEMORY: { value: (s$1) => memoryFormatter.format(s$1.memory) },
+			VCPUS: { value: (s$1) => s$1.vcpus },
+			RUNTIME: { value: (s$1) => s$1.runtime },
+			TIMEOUT: { value: (s$1) => timeAgo(s$1.createdAt + s$1.timeout) },
+			DURATION: { value: (s$1) => s$1.duration ? formatRunDuration(s$1.duration) : "-" },
+			SNAPSHOT: { value: (s$1) => s$1.sourceSnapshotId ?? "-" }
+		};
+		if (all) {
+			columns.CPU = { value: (s$1) => s$1.activeCpuDurationMs ? formatRunDuration(s$1.activeCpuDurationMs) : "-" };
+			columns["NETWORK (OUT/IN)"] = { value: (s$1) => s$1.networkTransfer?.egress || s$1.networkTransfer?.ingress ? `${formatBytes(s$1.networkTransfer?.egress ?? 0)} / ${formatBytes(s$1.networkTransfer?.ingress ?? 0)}` : "- / -" };
+		}
 		console.log(table({
 			rows: sessions$1,
-			columns: {
-				ID: { value: (s$1) => s$1.id },
-				STATUS: {
-					value: (s$1) => s$1.status,
-					color: (s$1) => SessionStatusColor[s$1.status] ?? source_default.reset
-				},
-				CREATED: { value: (s$1) => timeAgo(s$1.createdAt) },
-				MEMORY: { value: (s$1) => s$1.memory },
-				VCPUS: { value: (s$1) => s$1.vcpus },
-				RUNTIME: { value: (s$1) => s$1.runtime },
-				TIMEOUT: { value: (s$1) => timeAgo(s$1.createdAt + s$1.timeout) },
-				DURATION: { value: (s$1) => s$1.duration ? formatRunDuration(s$1.duration) : "-" }
-			}
+			columns
 		}));
 	}
 });
@@ -14883,11 +14938,11 @@ const listCommand = import_cjs$1.command({
 		const rows = [
 			{
 				field: "vCPUs",
-				value: String(sandbox.vcpus)
+				value: String(sandbox.vcpus ?? "-")
 			},
 			{
 				field: "Timeout",
-				value: (0, import_ms.default)(sandbox.timeout, { long: true })
+				value: sandbox.timeout != null ? (0, import_ms.default)(sandbox.timeout, { long: true }) : "-"
 			},
 			{
 				field: "Persistent",
@@ -15006,4 +15061,4 @@ const app = (opts) => (0, import_cjs.subcommands)({
 
 //#endregion
 export { source_exports as a, init_source as i, StyledError as n, require_cjs as r, app as t };
-//# sourceMappingURL=app-BvyZgr9h.mjs.map
+//# sourceMappingURL=app-CZIqoxxn.mjs.map