sandbox 3.0.2 → 3.1.1

package/dist/{app-C9tVyCZD.mjs → app-DWpJmO_S.mjs}

@@ -3102,13 +3102,13 @@ var require_ms = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/ms@2.1
 	* @return {String}
 	* @api private
 	*/
-	function fmtShort(ms$6) {
-		var msAbs = Math.abs(ms$6);
-		if (msAbs >= d) return Math.round(ms$6 / d) + "d";
-		if (msAbs >= h) return Math.round(ms$6 / h) + "h";
-		if (msAbs >= m) return Math.round(ms$6 / m) + "m";
-		if (msAbs >= s) return Math.round(ms$6 / s) + "s";
-		return ms$6 + "ms";
+	function fmtShort(ms$7) {
+		var msAbs = Math.abs(ms$7);
+		if (msAbs >= d) return Math.round(ms$7 / d) + "d";
+		if (msAbs >= h) return Math.round(ms$7 / h) + "h";
+		if (msAbs >= m) return Math.round(ms$7 / m) + "m";
+		if (msAbs >= s) return Math.round(ms$7 / s) + "s";
+		return ms$7 + "ms";
 	}
 	/**
 	* Long format for `ms`.
@@ -3117,20 +3117,20 @@ var require_ms = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/ms@2.1
 	* @return {String}
 	* @api private
 	*/
-	function fmtLong(ms$6) {
-		var msAbs = Math.abs(ms$6);
-		if (msAbs >= d) return plural(ms$6, msAbs, d, "day");
-		if (msAbs >= h) return plural(ms$6, msAbs, h, "hour");
-		if (msAbs >= m) return plural(ms$6, msAbs, m, "minute");
-		if (msAbs >= s) return plural(ms$6, msAbs, s, "second");
-		return ms$6 + " ms";
+	function fmtLong(ms$7) {
+		var msAbs = Math.abs(ms$7);
+		if (msAbs >= d) return plural(ms$7, msAbs, d, "day");
+		if (msAbs >= h) return plural(ms$7, msAbs, h, "hour");
+		if (msAbs >= m) return plural(ms$7, msAbs, m, "minute");
+		if (msAbs >= s) return plural(ms$7, msAbs, s, "second");
+		return ms$7 + " ms";
 	}
 	/**
 	* Pluralization helper.
 	*/
-	function plural(ms$6, msAbs, n, name) {
+	function plural(ms$7, msAbs, n, name) {
 		var isPlural = msAbs >= n * 1.5;
-		return Math.round(ms$6 / n) + " " + name + (isPlural ? "s" : "");
+		return Math.round(ms$7 / n) + " " + name + (isPlural ? "s" : "");
 	}
 }) });
 
@@ -7290,7 +7290,7 @@ const scope = {
 
 //#endregion
 //#region package.json
-var version = "3.0.2";
+var version = "3.1.1";
 
 //#endregion
 //#region src/error.ts
@@ -11190,9 +11190,9 @@ function printCommand(command$1, args$5) {
 
 //#endregion
 //#region src/interactive-shell/extend-sandbox-timeout.ts
-var import_ms$5 = /* @__PURE__ */ __toESM(require_ms());
+var import_ms$6 = /* @__PURE__ */ __toESM(require_ms());
 const debug$2 = createDebugger("sandbox:timeout");
-const BUFFER = (0, import_ms$5.default)("10 seconds");
+const BUFFER = (0, import_ms$6.default)("10 seconds");
 async function extendSandboxTimeoutPeriodically(sandbox, signal) {
 	const session = sandbox.currentSession();
 	const timeout$1 = session.timeout;
@@ -11207,7 +11207,7 @@ async function extendSandboxTimeoutPeriodically(sandbox, signal) {
 			debug$2(`sleeping for ${sleepMs}ms until next timeout extension`);
 			await setTimeout$1(sleepMs, null, { signal });
 		}
-		await sandbox.extendTimeout((0, import_ms$5.default)("5 minutes"));
+		await sandbox.extendTimeout((0, import_ms$6.default)("5 minutes"));
 		const updatedTimeout = session.timeout;
 		if (updatedTimeout == null) return;
 		const nextTick$1 = session.createdAt.getTime() + updatedTimeout;
@@ -11225,7 +11225,6 @@ const debugPty = createDebugger("sandbox:interactive-shell:pty");
 * That way, applications like `vim` and `nano` will work properly.
 */
 const TERM = "xterm-256color";
-const neverResolvedPromise = new Promise(() => {});
 /**
 * Prepares the sandbox environment for interactive shell by installing required dependencies
 * and copying the TTY server script.
@@ -11234,18 +11233,17 @@ const neverResolvedPromise = new Promise(() => {});
 * @returns Promise that resolves when environment is ready
 */
 async function setupSandboxEnvironment(sandbox, ora$1) {
+	let alreadyInstalled = false;
 	try {
-		var _usingCtx$1 = _usingCtx();
-		const installed = _usingCtx$1.u(createAbortController(`Finished installation`));
-		const waitUntilInstalled = checkIfServerInstalled(sandbox, installed.signal).then((installed$1) => installed$1 ? void 0 : neverResolvedPromise, (err$1) => {
-			debug$1("Error checking if server is installed:", err$1);
-		});
-		await Promise.race([installServerBinary(sandbox, ora$1, installed.signal), waitUntilInstalled.then(() => debug$1("Server binary already installed"))]).catch(installed.ignoreInterruptions);
-	} catch (_) {
-		_usingCtx$1.e = _;
-	} finally {
-		_usingCtx$1.d();
+		alreadyInstalled = await checkIfServerInstalled(sandbox);
+	} catch (err$1) {
+		debug$1("Error checking if server is installed:", err$1);
 	}
+	if (alreadyInstalled) {
+		debug$1("Server binary already installed");
+		return;
+	}
+	await installServerBinary(sandbox, ora$1);
 }
 async function checkIfServerInstalled(sandbox, signal) {
 	return (await sandbox.runCommand({
@@ -11316,7 +11314,7 @@ async function startServerCommand(sandbox, _listener, execution, sudo, env$2, cw
 */
 async function startInteractiveShell(options) {
 	try {
-		var _usingCtx3 = _usingCtx();
+		var _usingCtx$1 = _usingCtx();
 		const listener = createListener();
 		let command$1 = null;
 		let cleaned = false;
@@ -11332,14 +11330,14 @@ async function startInteractiveShell(options) {
 			cleaned = true;
 		};
 		process.once("beforeExit", cleanup);
-		const _cleanup = _usingCtx3.u(defer(cleanup));
-		const progress = _usingCtx3.u(acquireRelease(() => ora({ discardStdin: false }).start(), (s$1) => s$1.clear()));
+		const _cleanup = _usingCtx$1.u(defer(cleanup));
+		const progress = _usingCtx$1.u(acquireRelease(() => ora({ discardStdin: false }).start(), (s$1) => s$1.stop()));
 		progress.text = "Setting up sandbox environment";
 		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"));
+		const waitForProcess = _usingCtx$1.u(createAbortController("Connection established successfully"));
 		listener.connection.then(() => {
 			debug$1("listener.connection resolved");
 			waitForProcess.abort();
@@ -11348,35 +11346,41 @@ async function startInteractiveShell(options) {
 			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({
+		await Promise.all([throwIfCommandPrematurelyExited(command$1, waitForProcess.signal).catch(waitForProcess.ignoreInterruptions), attach({
 			sandbox: options.sandbox,
 			progress,
 			listener,
 			skipExtendingTimeout: options.skipExtendingTimeout,
 			printCommand: () => console.error(printCommand(options.execution[0], options.execution.slice(1)))
-		})]).catch(waitForProcess.ignoreInterruptions);
+		})]);
 	} catch (_) {
-		_usingCtx3.e = _;
+		_usingCtx$1.e = _;
 	} finally {
-		_usingCtx3.d();
+		_usingCtx$1.d();
 	}
 }
 async function throwIfCommandPrematurelyExited(command$1, signal) {
+	let exitCode;
 	try {
-		const { exitCode } = await command$1.wait({ signal });
-		throw new Error([
-			`Interactive shell failed to start (exit code: ${exitCode}).`,
-			`${source_default.bold("hint:")} The sandbox may have timed out or encountered an error.`,
-			"╰▶ Check sandbox status with `sandbox list` or view logs for details."
-		].join("\n"));
+		({exitCode} = await command$1.wait({ signal }));
 	} catch (err$1) {
 		if (signal.aborted) return;
 		throw err$1;
 	}
+	let serverError = "";
+	try {
+		serverError = (await command$1.stderr({ signal })).trim();
+	} catch {}
+	throw new Error([
+		`Interactive shell failed to start (exit code: ${exitCode}).`,
+		`${source_default.bold("hint:")} The sandbox may have timed out or encountered an error.`,
+		...serverError ? [source_default.dim(serverError)] : [],
+		"╰▶ Check sandbox status with `sandbox list` or view logs for details."
+	].join("\n"));
 }
 async function attach({ progress, listener, printCommand: printCommand$1, sandbox, skipExtendingTimeout }) {
 	try {
-		var _usingCtx4 = _usingCtx();
+		var _usingCtx3 = _usingCtx();
 		progress.text = "Waiting for connection...";
 		const details = await listener.connection;
 		assert(sandbox.interactivePort, "Sandbox interactive port is not defined");
@@ -11391,7 +11395,7 @@ async function attach({ progress, listener, printCommand: printCommand$1, sandbo
 			return c$1;
 		});
 		progress.stop();
-		const extensionController = _usingCtx4.u(createAbortController("stopped extensions"));
+		const extensionController = _usingCtx3.u(createAbortController("stopped extensions"));
 		if (!skipExtendingTimeout) extendSandboxTimeoutPeriodically(sandbox, extensionController.signal).catch(extensionController.ignoreInterruptions);
 		client.sendMessage({ type: "ready" });
 		client.sendMessage({
@@ -11417,9 +11421,9 @@ async function attach({ progress, listener, printCommand: printCommand$1, sandbo
 		client.close();
 		console.error(source_default.dim(`\n╰▶ connection to ▲ ${sandbox.name} closed.`));
 	} catch (_) {
-		_usingCtx4.e = _;
+		_usingCtx3.e = _;
 	} finally {
-		_usingCtx4.d();
+		_usingCtx3.d();
 	}
 }
 /**
@@ -11447,16 +11451,16 @@ async function* messageReader(stream) {
 */
 async function connect$1(command$1, listener, signal) {
 	try {
-		var _usingCtx5 = _usingCtx();
-		const logs = _usingCtx5.u(command$1.logs({ signal }));
-		const stderrStream = _usingCtx5.u(getStderrStream());
+		var _usingCtx4 = _usingCtx();
+		const logs = _usingCtx4.u(command$1.logs({ signal }));
+		const stderrStream = _usingCtx4.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 = _;
+		_usingCtx4.e = _;
 	} finally {
-		_usingCtx5.d();
+		_usingCtx4.d();
 	}
 }
 async function openWithRetry(create$1) {
@@ -11480,11 +11484,11 @@ async function openWithRetry(create$1) {
 		factor: 0
 	});
 }
-function withTimeout(promise, ms$6) {
+function withTimeout(promise, ms$7) {
 	promise.catch(() => {});
 	let timer;
 	const timeout$1 = new Promise((_, reject) => {
-		timer = setTimeout(() => reject(/* @__PURE__ */ new Error(`Operation timed out after ${ms$6}ms`)), ms$6);
+		timer = setTimeout(() => reject(/* @__PURE__ */ new Error(`Operation timed out after ${ms$7}ms`)), ms$7);
 	});
 	return Promise.race([promise, timeout$1]).finally(() => {
 		if (timer) clearTimeout(timer);
@@ -11545,6 +11549,7 @@ const ObjectFromKeyValue = import_cjs$18.extendType(import_cjs$18.array(KeyValue
 //#endregion
 //#region src/commands/exec.ts
 var import_cjs$17 = /* @__PURE__ */ __toESM(require_cjs());
+var import_ms$5 = /* @__PURE__ */ __toESM(require_ms());
 init_source();
 const args$4 = {
 	sandbox: import_cjs$17.positional({ type: sandboxName }),
@@ -11595,18 +11600,25 @@ const args$4 = {
 		type: ObjectFromKeyValue,
 		description: "Environment variables to set for the command"
 	}),
+	timeout: import_cjs$17.option({
+		long: "timeout",
+		type: import_cjs$17.optional(Duration),
+		description: "Maximum duration to wait for the command (e.g. 30s, 5m). On expiry the process is killed with SIGKILL. Cannot be combined with --interactive."
+	}),
 	scope
 };
 const exec = import_cjs$17.command({
 	name: "exec",
 	description: "Execute a command in an existing sandbox",
 	args: args$4,
-	async handler({ command: command$1, cwd, args: args$5, asSudo, sandbox: sandboxName$1, scope: { token: token$1, team: team$1, project: project$1 }, interactive, envVars, skipExtendingTimeout }) {
+	async handler({ command: command$1, cwd, args: args$5, asSudo, sandbox: sandboxName$1, scope: { token: token$1, team: team$1, project: project$1 }, interactive, envVars, skipExtendingTimeout, timeout: timeout$1 }) {
+		if (interactive && timeout$1) throw new Error(["--timeout cannot be combined with --interactive.", `${source_default.bold("hint:")} Remove one of the two flags. Interactive sessions do not enforce a command timeout.`].join("\n"));
 		const sandbox = typeof sandboxName$1 !== "string" ? sandboxName$1 : await sandboxClient.get({
 			name: sandboxName$1,
 			projectId: project$1,
 			teamId: team$1,
 			token: token$1,
+			resume: true,
 			__includeSystemRoutes: true
 		});
 		if (!interactive) {
@@ -11618,8 +11630,10 @@ const exec = import_cjs$17.command({
 				stdout: process.stdout,
 				sudo: asSudo,
 				cwd,
-				env: envVars
+				env: envVars,
+				timeoutMs: timeout$1 ? (0, import_ms$5.default)(timeout$1) : void 0
 			});
+			if (timeout$1 && result.exitCode === 137) console.error(`${source_default.yellow("Command was killed (SIGKILL, exit code 137)")}.`);
 			process.exitCode = result.exitCode;
 		} else await startInteractiveShell({
 			sandbox,
@@ -11889,7 +11903,8 @@ const create = import_cjs$15.command({
 			command: "sh",
 			interactive: true,
 			tty: true,
-			sandbox
+			sandbox,
+			timeout: void 0
 		});
 		return sandbox;
 	}
@@ -12010,7 +12025,8 @@ const fork = import_cjs$14.command({
 			command: "sh",
 			interactive: true,
 			tty: true,
-			sandbox
+			sandbox,
+			timeout: void 0
 		});
 		return sandbox;
 	}
@@ -12029,7 +12045,7 @@ function omit(obj, ...keys) {
 var import_cjs$13 = /* @__PURE__ */ __toESM(require_cjs());
 const args$1 = {
 	...args$3,
-	...omit(args$4, "sandbox"),
+	...omit(args$4, "sandbox", "timeout"),
 	removeAfterUse: import_cjs$13.flag({
 		long: "rm",
 		description: "Automatically remove the sandbox when the command exits."
@@ -12069,7 +12085,8 @@ const run = import_cjs$13.command({
 		try {
 			await exec.handler({
 				...rest$1,
-				sandbox
+				sandbox,
+				timeout: void 0
 			});
 		} finally {
 			if (removeAfterUse) await sandbox.delete();
@@ -14798,10 +14815,10 @@ const snapshot = import_cjs$6.command({
 init_source();
 function formatExpires(expiresAt) {
 	if (expiresAt === void 0) return source_default.gray("never");
-	const ms$6 = expiresAt - Date.now();
-	if (ms$6 <= 0) return source_default.red("expired");
+	const ms$7 = expiresAt - Date.now();
+	if (ms$7 <= 0) return source_default.red("expired");
 	const formatted = timeAgo(expiresAt);
-	return ms$6 <= 3600 * 1e3 ? source_default.red(formatted) : source_default.green(formatted);
+	return ms$7 <= 3600 * 1e3 ? source_default.red(formatted) : source_default.green(formatted);
 }
 function renderNode(id, expiresAt, isCurrent) {
 	const bullet = isCurrent ? source_default.magenta.bold("●") : source_default.magenta("●");
@@ -15860,4 +15877,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-C9tVyCZD.mjs.map
+//# sourceMappingURL=app-DWpJmO_S.mjs.map