sandbox 3.0.1 → 3.1.0

package/dist/{app-C3bsrMUR.mjs → app-CUphjb1B.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.1";
+var version = "3.1.0";
 
 //#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;
@@ -11383,11 +11383,13 @@ async function attach({ progress, listener, printCommand: printCommand$1, sandbo
 		const url = `wss://${sandbox.domain(sandbox.interactivePort).replace(/^https?:\/\//, "")}`;
 		debug$1("Connecting to WebSocket URL:", url);
 		const stdoutPipe = messageReader(process.stdout);
-		const client = details.createClient(url);
-		client.addEventListener("message", async ({ data }) => {
-			stdoutPipe.next(data);
+		const client = await openWithRetry(() => {
+			const c$1 = details.createClient(url);
+			c$1.addEventListener("message", async ({ data }) => {
+				stdoutPipe.next(data);
+			});
+			return c$1;
 		});
-		await client.waitForOpen();
 		progress.stop();
 		const extensionController = _usingCtx4.u(createAbortController("stopped extensions"));
 		if (!skipExtendingTimeout) extendSandboxTimeoutPeriodically(sandbox, extensionController.signal).catch(extensionController.ignoreInterruptions);
@@ -11457,6 +11459,37 @@ async function connect$1(command$1, listener, signal) {
 		_usingCtx5.d();
 	}
 }
+async function openWithRetry(create$1) {
+	return retry(async (_bail, attempt) => {
+		const client = create$1();
+		try {
+			await withTimeout(client.waitForOpen(), 2500);
+			return client;
+		} catch (err$1) {
+			debug$1("WebSocket open attempt %d failed: %o", attempt, err$1);
+			try {
+				client.close();
+			} catch (closeErr) {
+				debug$1("WebSocket close after failed open errored: %o", closeErr);
+			}
+			throw err$1;
+		}
+	}, {
+		retries: 2,
+		minTimeout: 500,
+		factor: 0
+	});
+}
+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$7}ms`)), ms$7);
+	});
+	return Promise.race([promise, timeout$1]).finally(() => {
+		if (timer) clearTimeout(timer);
+	});
+}
 function getStderrStream() {
 	return acquireRelease(() => {
 		if (INTERACTIVE_BIN_OUTPUT) {
@@ -11512,6 +11545,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 }),
@@ -11562,13 +11596,19 @@ 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,
@@ -11585,8 +11625,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,
@@ -11856,7 +11898,8 @@ const create = import_cjs$15.command({
 			command: "sh",
 			interactive: true,
 			tty: true,
-			sandbox
+			sandbox,
+			timeout: void 0
 		});
 		return sandbox;
 	}
@@ -11977,7 +12020,8 @@ const fork = import_cjs$14.command({
 			command: "sh",
 			interactive: true,
 			tty: true,
-			sandbox
+			sandbox,
+			timeout: void 0
 		});
 		return sandbox;
 	}
@@ -11996,7 +12040,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."
@@ -12036,7 +12080,8 @@ const run = import_cjs$13.command({
 		try {
 			await exec.handler({
 				...rest$1,
-				sandbox
+				sandbox,
+				timeout: void 0
 			});
 		} finally {
 			if (removeAfterUse) await sandbox.delete();
@@ -14765,10 +14810,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("●");
@@ -14783,11 +14828,11 @@ function renderSiblings(siblings, count) {
 	const remaining = totalCount - 1 - shown.length;
 	for (let i = 0; i < shown.length; i++) {
 		const connector = i === shown.length - 1 && remaining <= 0 ? "╰──" : "├──";
-		lines.push(`│   ${connector} ${source_default.gray(shown[i].sourceSessionId)}`);
+		lines.push(`│   ${connector} ${source_default.gray(shown[i].id)}`);
 	}
 	if (remaining > 0) {
 		const suffix = hasPlus ? "+" : "";
-		lines.push(`│   ╰── ${source_default.gray(`+${remaining}${suffix} more sandboxes`)}`);
+		lines.push(`│   ╰── ${source_default.gray(`+${remaining}${suffix} more snapshots`)}`);
 	}
 	return lines;
 }
@@ -14805,7 +14850,7 @@ function renderSnapshotTree(params) {
 	if (descendantNodes.length > 0) for (const node of [...descendantNodes].reverse()) pushNode(node, false);
 	if (!hideCurrent) {
 		const { currentSnapshotId: id, currentSnapshotExpiresAt } = params;
-		pushNode(ancestors.snapshots.find((n) => n.snapshot.id === id) ?? descendants.snapshots.find((n) => n.snapshot.id === id) ?? {
+		pushNode(params.current ?? ancestors.snapshots.find((n) => n.snapshot.id === id) ?? descendants.snapshots.find((n) => n.snapshot.id === id) ?? {
 			snapshot: {
 				id,
 				sourceSessionId: "",
@@ -15097,7 +15142,8 @@ const tree = import_cjs$4.command({
 					currentSnap,
 					currentSnapshotId,
 					ancestors,
-					descendants
+					descendants,
+					current: ancestors.anchor ?? descendants.anchor
 				};
 			} catch (_) {
 				_usingCtx5.e = _;
@@ -15113,7 +15159,8 @@ const tree = import_cjs$4.command({
 			currentSnapshotId: result.currentSnapshotId,
 			currentSnapshotExpiresAt: result.currentSnap.expiresAt?.getTime(),
 			ancestors: result.ancestors,
-			descendants: result.descendants
+			descendants: result.descendants,
+			current: result.current
 		}));
 		const limitArg = limit !== void 0 ? ` --limit ${limit}` : "";
 		if (result.ancestors.pagination.next !== null) console.log(`\nMore ancestors: sandbox snapshots tree ${name} --sort-order desc${limitArg} --cursor ${result.ancestors.pagination.next}`);
@@ -15825,4 +15872,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-C3bsrMUR.mjs.map
+//# sourceMappingURL=app-CUphjb1B.mjs.map