sandbox 3.1.0 → 3.1.1

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

@@ -7290,7 +7290,7 @@ const scope = {
 
 //#endregion
 //#region package.json
-var version = "3.1.0";
+var version = "3.1.1";
 
 //#endregion
 //#region src/error.ts
@@ -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) {
@@ -11614,6 +11618,7 @@ const exec = import_cjs$17.command({
 			projectId: project$1,
 			teamId: team$1,
 			token: token$1,
+			resume: true,
 			__includeSystemRoutes: true
 		});
 		if (!interactive) {
@@ -15872,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-CUphjb1B.mjs.map
+//# sourceMappingURL=app-DWpJmO_S.mjs.map