setsuna-microvm 0.5.2 → 0.5.4

package/LICENSE

@@ -1,32 +1,32 @@
-SemSwitch Setsuna Research Preview Client License
-
-Copyright © 2026 SemSwitch, Inc. All rights reserved.
-
-The Setsuna client distributed in this package is proprietary software owned by SemSwitch, Inc.
-("SemSwitch"). It is provided for authorized use with the Setsuna Research Preview.
-
-1. Grant. Subject to the SemSwitch Terms of Service (https://semswitch.com/terms) and any
-   applicable Order or evaluation agreement, an authorized user receives a limited, non-exclusive
-   right to install and use the Setsuna client solely to access or evaluate the Setsuna service
-   that the user is authorized to use.
-
-2. Ownership. The Setsuna client is licensed, not sold. SemSwitch retains all ownership,
-   copyright, and other intellectual property rights in the Setsuna client. This license transfers
-   no ownership or other intellectual property rights.
-
-3. Restrictions. Except where expressly permitted by an applicable agreement with SemSwitch or by
-   non-waivable law, no right is granted to redistribute, sublicense, sell, rent, publish, modify,
-   create derivative works from, reverse engineer, decompile, or disassemble the Setsuna client.
-
-4. Third-party software. The Setsuna client uses third-party software and components that are not
-   owned by SemSwitch. They remain governed by their respective licenses and notices, which this
-   license does not modify or replace.
-
-5. Term. The right to use the Setsuna client ends when the applicable Setsuna authorization ends.
-
-6. Agreements. If an applicable signed Order or separately negotiated agreement with SemSwitch
-   expressly conflicts with this license, that Order or agreement controls.
-
-7. Warranties, liability, and service terms. Warranties, disclaimers, limitations of liability,
-   and the terms of the Setsuna service are governed by the applicable agreement and the SemSwitch
-   Terms of Service rather than by this license.
+SemSwitch Setsuna Research Preview Client License
+
+Copyright © 2026 SemSwitch, Inc. All rights reserved.
+
+The Setsuna client distributed in this package is proprietary software owned by SemSwitch, Inc.
+("SemSwitch"). It is provided for authorized use with the Setsuna Research Preview.
+
+1. Grant. Subject to the SemSwitch Terms of Service (https://semswitch.com/terms) and any
+   applicable Order or evaluation agreement, an authorized user receives a limited, non-exclusive
+   right to install and use the Setsuna client solely to access or evaluate the Setsuna service
+   that the user is authorized to use.
+
+2. Ownership. The Setsuna client is licensed, not sold. SemSwitch retains all ownership,
+   copyright, and other intellectual property rights in the Setsuna client. This license transfers
+   no ownership or other intellectual property rights.
+
+3. Restrictions. Except where expressly permitted by an applicable agreement with SemSwitch or by
+   non-waivable law, no right is granted to redistribute, sublicense, sell, rent, publish, modify,
+   create derivative works from, reverse engineer, decompile, or disassemble the Setsuna client.
+
+4. Third-party software. The Setsuna client uses third-party software and components that are not
+   owned by SemSwitch. They remain governed by their respective licenses and notices, which this
+   license does not modify or replace.
+
+5. Term. The right to use the Setsuna client ends when the applicable Setsuna authorization ends.
+
+6. Agreements. If an applicable signed Order or separately negotiated agreement with SemSwitch
+   expressly conflicts with this license, that Order or agreement controls.
+
+7. Warranties, liability, and service terms. Warranties, disclaimers, limitations of liability,
+   and the terms of the Setsuna service are governed by the applicable agreement and the SemSwitch
+   Terms of Service rather than by this license.

package/dist/cli.js

@@ -10,6 +10,9 @@ var __export = (target, all) => {
 };
 
 // ../setsuna/src/tui/customer/prompt.ts
+function readText(text, now) {
+  return typeof text === "function" ? text(now) : text;
+}
 var TUI_CANCEL;
 var init_prompt = __esm({
   "../setsuna/src/tui/customer/prompt.ts"() {
@@ -76,14 +79,13 @@ function adaptPrompts(clack, guide) {
   const { confirm, isCancel, select, text } = clack;
   return {
     async select(options, io) {
-      const result = await select({
-        ...options,
-        options: [...options.options],
-        ...guide(options),
-        input: io.input,
-        output: io.output
-      });
-      return isCancel(result) ? TUI_CANCEL : result;
+      const redraw = hasTimedText(options) ? setInterval(() => io.output.emit("resize"), 1e3) : void 0;
+      try {
+        const result = await select(selectOptions(options, guide(options), io));
+        return isCancel(result) ? TUI_CANCEL : result;
+      } finally {
+        if (redraw !== void 0) clearInterval(redraw);
+      }
     },
     async text(options, io) {
       const result = await text({
@@ -106,6 +108,28 @@ function adaptPrompts(clack, guide) {
     }
   };
 }
+function selectOptions(options, guide, io) {
+  return {
+    get message() {
+      return readText(options.message, Date.now());
+    },
+    options: options.options.map((option) => ({
+      value: option.value,
+      label: option.label,
+      get hint() {
+        return option.hint === void 0 ? void 0 : readText(option.hint, Date.now());
+      }
+    })),
+    initialValue: options.initialValue,
+    signal: options.signal,
+    ...guide,
+    input: io.input,
+    output: io.output
+  };
+}
+function hasTimedText(options) {
+  return typeof options.message === "function" || options.options.some(({ hint }) => typeof hint === "function");
+}
 function adaptSpinner(clack, io, options, guide) {
   const completion = trackInterruption(clack, io, options.onCancel, guide);
   const spinner = clack.spinner({
@@ -1089,6 +1113,7 @@ function parsePreviewCliArgs(args) {
       "timeout-ms": { type: "string" },
       "request-timeout-ms": { type: "string" },
       "configuration-id": { type: "string" },
+      duration: { type: "string" },
       attach: { type: "string" },
       json: { type: "boolean", default: false },
       help: { type: "boolean", short: "h", default: false },
@@ -1200,14 +1225,14 @@ function hasOnlyKeys(value, allowed) {
 }
 function parseLease(value, expectedConfigurationId) {
   const sandboxId = parseLeaseSandboxId(value);
-  if (!isRecord(value) || typeof value.expiresAt !== "string") {
+  if (!isRecord(value) || typeof value.expiresAt !== "string" || !Number.isFinite(Date.parse(value.expiresAt)) || value.duration !== "20m" && value.duration !== "1h" && value.duration !== "2h") {
     throw invalidResponse("sandbox lease");
   }
   const microvmConfiguration = parseMicrovmConfiguration(value.microvmConfiguration);
   if (expectedConfigurationId !== void 0 && microvmConfiguration.id !== expectedConfigurationId) {
     throw invalidResponse("sandbox lease");
   }
-  return { sandboxId, expiresAt: value.expiresAt, microvmConfiguration };
+  return { sandboxId, expiresAt: value.expiresAt, duration: value.duration, microvmConfiguration };
 }
 function parseLeaseSandboxId(value) {
   if (!isRecord(value) || !nonEmptyResponseString(value.sandboxId))
@@ -1248,6 +1273,36 @@ function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// ../setsuna/src/client-affinity.ts
+var FrontDoorAffinity = class {
+  #origin;
+  #cookies = /* @__PURE__ */ new Map();
+  constructor(serviceUrl) {
+    this.#origin = serviceUrl.origin;
+  }
+  headersFor(url, headers) {
+    if (url.origin !== this.#origin || this.#cookies.size === 0) return headers;
+    const result = new Headers(headers);
+    result.set("cookie", [...this.#cookies].map(([name, value]) => `${name}=${value}`).join("; "));
+    return result;
+  }
+  capture(url, response) {
+    if (url.origin !== this.#origin) return;
+    if (response.url !== "" && new URL(response.url).origin !== this.#origin) return;
+    for (const header of response.headers.getSetCookie()) {
+      const pair = header.split(";", 1)[0]?.trim() ?? "";
+      const match = /^(ASLBSA|ASLBSACORS)=([\x21\x23-\x2B\x2D-\x3A\x3C-\x5B\x5D-\x7E]*)$/u.exec(
+        pair
+      );
+      if (match === null) continue;
+      const [, name, value] = match;
+      if (name === void 0 || value === void 0) continue;
+      if (value === "") this.#cookies.delete(name);
+      else this.#cookies.set(name, value);
+    }
+  }
+};
+
 // ../setsuna/src/client-options.ts
 var PREVIEW_SERVICE_URL = "https://api.setsuna.semswitch.com/";
 function normalizeServiceUrl(value) {
@@ -1285,12 +1340,16 @@ function normalizeCreateOptions(options) {
     throw new TypeError("create options must be an object.");
   }
   const unsupported = Object.keys(options).find(
-    (key) => key !== "microvmConfigurationId" && key !== "network"
+    (key) => key !== "microvmConfigurationId" && key !== "network" && key !== "duration"
   );
   if (unsupported !== void 0) throw new TypeError(`Unsupported create option: ${unsupported}.`);
+  const duration = options.duration === void 0 ? "20m" : options.duration;
+  if (duration !== "20m" && duration !== "1h" && duration !== "2h")
+    throw new TypeError("duration must be 20m, 1h, or 2h.");
   const microvmConfigurationId = options.microvmConfigurationId === void 0 ? void 0 : nonEmptyString(options.microvmConfigurationId, "microvmConfigurationId");
   const network = options.network === void 0 ? void 0 : validateRoutedNetwork(options.network);
   return {
+    duration,
     ...microvmConfigurationId === void 0 ? {} : { microvmConfigurationId },
     ...network === void 0 ? {} : { network }
   };
@@ -1359,7 +1418,7 @@ function isLoopbackHostname(hostname) {
 }
 
 // ../setsuna/src/client-request.ts
-async function requestJson(serviceUrl, defaultTimeoutMs, getAccessToken, path3, options) {
+async function requestJson(serviceUrl, defaultTimeoutMs, getAccessToken, path3, options, affinity) {
   const requestTimeoutMs = options.requestTimeoutMs === void 0 ? defaultTimeoutMs : positiveMilliseconds(options.requestTimeoutMs, "requestTimeoutMs");
   const timeoutSignal = AbortSignal.timeout(requestTimeoutMs);
   const signal = options.signal === void 0 ? timeoutSignal : AbortSignal.any([options.signal, timeoutSignal]);
@@ -1376,7 +1435,8 @@ async function requestJson(serviceUrl, defaultTimeoutMs, getAccessToken, path3,
     requestTimeoutMs,
     timeoutSignal,
     signal,
-    accessToken
+    accessToken,
+    affinity
   );
   const responseBody = response.status === 204 ? void 0 : await parseResponseJson(response);
   if (!response.ok) throw brokerResponseError(response, responseBody);
@@ -1417,14 +1477,17 @@ function settleBeforeAbort(pending, signal) {
     if (signal.aborted) onAbort();
   });
 }
-async function fetchService(url, options, requestTimeoutMs, timeoutSignal, signal, accessToken) {
+async function fetchService(url, options, requestTimeoutMs, timeoutSignal, signal, accessToken, affinity) {
   try {
-    return await fetch(url, {
+    const headers = requestHeaders(options.body, accessToken);
+    const response = await fetch(url, {
       method: options.method,
-      headers: requestHeaders(options.body, accessToken),
+      headers: affinity?.headersFor(url, headers) ?? headers,
       body: options.body === void 0 ? void 0 : JSON.stringify(options.body),
       signal
     });
+    affinity?.capture(url, response);
+    return response;
   } catch (error) {
     throwCancellationFailure(error, requestTimeoutMs, timeoutSignal, options.signal);
     throw new SetsunaError("The local Setsuna service could not be reached.", {
@@ -1559,13 +1622,14 @@ function parseProcessList(value) {
   if (!Array.isArray(value)) throw invalidResponse2("process list");
   return value.map(parseProcessInfo);
 }
-function attachProcessStream(serviceUrl, path3, options, getAccessToken) {
+function attachProcessStream(serviceUrl, path3, options, getAccessToken, affinity) {
   return {
     async *[Symbol.asyncIterator]() {
       const response = await fetchProcessStream(
         new URL(path3, serviceUrl),
         options.signal,
-        getAccessToken
+        getAccessToken,
+        affinity
       );
       if (response.body === null) throw invalidResponse2("process stream");
       yield* decodeFrames(response.body, options.signal);
@@ -1586,15 +1650,17 @@ function processFrameToJson(frame) {
   }
   return frame;
 }
-async function fetchProcessStream(url, signal, getAccessToken) {
+async function fetchProcessStream(url, signal, getAccessToken, affinity) {
   const accessToken = await processAccessToken(getAccessToken, signal);
   let response;
   try {
+    const headers = accessToken === void 0 ? void 0 : { authorization: `Bearer ${accessToken}` };
     response = await fetch(url, {
       method: "GET",
       signal,
-      ...accessToken === void 0 ? {} : { headers: { authorization: `Bearer ${accessToken}` } }
+      ...headers === void 0 ? {} : { headers: affinity?.headersFor(url, headers) ?? headers }
     });
+    affinity?.capture(url, response);
   } catch (error) {
     throw requestError(error, signal);
   }
@@ -1768,11 +1834,13 @@ function reportRunPhase(callback, phase) {
 
 // ../setsuna/src/client.ts
 var DEFAULT_REQUEST_TIMEOUT_MS = 6e4;
-var DEFAULT_CLEANUP_TIMEOUT_MS = 1e4;
+var DEFAULT_RUN_REQUEST_TIMEOUT_MS = 6e4 + 12e4 + 6e4;
 var SetsunaClient = class {
   #serviceUrl;
   #requestTimeoutMs;
+  #explicitRequestTimeoutMs;
   #getAccessToken;
+  #affinity;
   constructor(options = {}) {
     if (options.serviceUrl !== void 0 && options.remote !== void 0) {
       throw new TypeError("serviceUrl and remote are mutually exclusive.");
@@ -1786,7 +1854,9 @@ var SetsunaClient = class {
       }
       this.#serviceUrl = new URL(PREVIEW_SERVICE_URL);
       this.#getAccessToken = options.remote.getAccessToken;
+      this.#affinity = new FrontDoorAffinity(this.#serviceUrl);
     }
+    this.#explicitRequestTimeoutMs = options.requestTimeoutMs;
     this.#requestTimeoutMs = positiveMilliseconds(
       options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS,
       "requestTimeoutMs"
@@ -1806,20 +1876,7 @@ var SetsunaClient = class {
       method: "POST",
       body: { ...createOptions }
     });
-    const sandboxId = parseLeaseSandboxId(response);
-    try {
-      return parseLease(response, createOptions.microvmConfigurationId);
-    } catch (error) {
-      try {
-        await this.#destroy(sandboxId, DEFAULT_CLEANUP_TIMEOUT_MS);
-      } catch (cleanupFailure) {
-        throw new AggregateError(
-          [error, cleanupFailure],
-          "Sandbox lease validation and destruction both failed."
-        );
-      }
-      throw error;
-    }
+    return parseLease(response, createOptions.microvmConfigurationId);
   }
   async list() {
     return parseSandboxList(await this.#request("v1/sandboxes", { method: "GET" }));
@@ -1832,14 +1889,6 @@ var SetsunaClient = class {
       })
     );
   }
-  async renew(sandboxId) {
-    const validatedSandboxId = nonEmptyString(sandboxId, "sandboxId");
-    return parseSandboxStatus(
-      await this.#request(`v1/sandboxes/${encodeURIComponent(validatedSandboxId)}/renew`, {
-        method: "POST"
-      })
-    );
-  }
   async execute(sandboxId, command, options = {}) {
     const validatedSandboxId = nonEmptyString(sandboxId, "sandboxId");
     const validatedCommand = nonEmptyString(command, "command");
@@ -1876,7 +1925,8 @@ var SetsunaClient = class {
       this.#serviceUrl,
       `${processPath(sandboxId)}/${encodeURIComponent(nonEmptyString(processId, "processId"))}/attach${query}`,
       options,
-      this.#getAccessToken
+      this.#getAccessToken,
+      this.#affinity
     );
   }
   async writeProcessStdin(sandboxId, processId, data) {
@@ -1913,44 +1963,30 @@ var SetsunaClient = class {
     });
   }
   async run(command, options = {}) {
-    let sandboxId;
-    const cleanupTimeoutMs = positiveMilliseconds(
-      options.cleanupTimeoutMs ?? DEFAULT_CLEANUP_TIMEOUT_MS,
-      "cleanupTimeoutMs"
+    const unsupported = Object.keys(options).find(
+      (key) => !["microvmConfigurationId", "timeoutMs", "requestTimeoutMs", "signal", "onPhase"].includes(
+        key
+      )
     );
-    let executionOutcome;
-    try {
-      reportRunPhase(options.onPhase, "starting-microvm");
-      const lease = await this.create({
-        ...options.microvmConfigurationId === void 0 ? {} : { microvmConfigurationId: options.microvmConfigurationId },
-        ...options.network === void 0 ? {} : { network: options.network }
-      });
-      sandboxId = lease.sandboxId;
-      reportRunPhase(options.onPhase, "microvm-ready");
-      reportRunPhase(options.onPhase, "running-command");
-      executionOutcome = { ok: true, result: await this.execute(sandboxId, command, options) };
-    } catch (error) {
-      executionOutcome = { ok: false, error };
-    }
-    if (sandboxId !== void 0) {
-      try {
-        reportRunPhase(options.onPhase, "destroying-microvm");
-        await this.#destroy(sandboxId, cleanupTimeoutMs);
-        reportRunPhase(options.onPhase, "microvm-destroyed");
-      } catch (cleanupFailure) {
-        if (!executionOutcome.ok) {
-          throw new AggregateError(
-            [executionOutcome.error, cleanupFailure],
-            "Sandbox execution and destruction both failed."
-          );
-        }
-        throw cleanupFailure;
-      }
-    }
-    if (!executionOutcome.ok) {
-      throw executionOutcome.error;
-    }
-    return executionOutcome.result;
+    if (unsupported !== void 0) throw new TypeError(`Unsupported run option: ${unsupported}.`);
+    const validatedCommand = nonEmptyString(command, "command");
+    const timeoutMs = options.timeoutMs === void 0 ? void 0 : positiveMilliseconds(options.timeoutMs, "timeoutMs");
+    const microvmConfigurationId = options.microvmConfigurationId === void 0 ? void 0 : nonEmptyString(options.microvmConfigurationId, "microvmConfigurationId");
+    reportRunPhase(options.onPhase, "running");
+    const result = parseExecutionResult(
+      await this.#request("v1/run", {
+        method: "POST",
+        body: {
+          command: validatedCommand,
+          ...microvmConfigurationId === void 0 ? {} : { microvmConfigurationId },
+          ...timeoutMs === void 0 ? {} : { timeoutMs }
+        },
+        signal: options.signal,
+        requestTimeoutMs: options.requestTimeoutMs ?? this.#explicitRequestTimeoutMs ?? Math.max(DEFAULT_RUN_REQUEST_TIMEOUT_MS, (timeoutMs ?? 0) + 12e4)
+      })
+    );
+    reportRunPhase(options.onPhase, "complete");
+    return result;
   }
   async #request(path3, options) {
     return requestJson(
@@ -1958,7 +1994,8 @@ var SetsunaClient = class {
       this.#requestTimeoutMs,
       this.#getAccessToken,
       path3,
-      options
+      options,
+      this.#affinity
     );
   }
 };
@@ -1979,7 +2016,7 @@ async function runWithSignalCleanup(client, command, options, io, signalRuntime)
     const exitCode = signal === "SIGINT" ? 130 : 143;
     if (interruptedExitCode === void 0) {
       interruptedExitCode = exitCode;
-      io.errorOutput.write("Interrupt received; destroying sandbox...\n");
+      io.errorOutput.write("Interrupt received; Setsuna owns run cleanup.\n");
       controller.abort();
       return;
     }
@@ -2081,98 +2118,19 @@ function enterRawMode(input) {
   const wasPaused = input.isPaused();
   input.setRawMode(true);
   input.resume();
-  let restored = false;
+  let restored;
   return () => {
-    if (restored) return;
-    restored = true;
-    input.setRawMode?.(wasRaw);
-    if (wasPaused) input.pause();
+    restored ??= restoreInput(input, wasRaw, wasPaused);
+    return restored;
   };
 }
-
-// ../setsuna/src/lease-keeper.ts
-var MAX_TIMER_DELAY_MS = 2147483647;
-var SYSTEM_RUNTIME = {
-  now: Date.now,
-  setTimeout: (callback, delayMs) => setTimeout(callback, delayMs),
-  clearTimeout: (handle) => clearTimeout(handle)
-};
-var ActiveLeaseKeeper = class {
-  #client;
-  #sandboxId;
-  #runtime;
-  #expiresAtMs;
-  #failureHandler;
-  #running = false;
-  #timer;
-  constructor(client, sandboxId, runtime = SYSTEM_RUNTIME) {
-    this.#client = client;
-    this.#sandboxId = sandboxId;
-    this.#runtime = runtime;
-  }
-  async renewNow() {
-    if (this.#running) throw new TypeError("Cannot prime a running lease keeper.");
-    this.#expiresAtMs = await this.#renewExpiry();
-  }
-  start(onFailure) {
-    if (this.#running) throw new TypeError("The lease keeper is already running.");
-    if (this.#expiresAtMs === void 0) {
-      throw new TypeError("The lease keeper must renew the sandbox before it starts.");
-    }
-    this.#running = true;
-    this.#failureHandler = onFailure;
-    try {
-      this.#schedule(this.#expiresAtMs);
-    } catch (error) {
-      this.#running = false;
-      this.#failureHandler = void 0;
-      throw error;
-    }
-  }
-  stop() {
-    this.#running = false;
-    this.#failureHandler = void 0;
-    if (this.#timer !== void 0) this.#runtime.clearTimeout(this.#timer);
-    this.#timer = void 0;
-  }
-  async #renewExpiry() {
-    const { expiresAt } = await this.#client.renew(this.#sandboxId);
-    const expiresAtMs = Date.parse(expiresAt);
-    if (!Number.isFinite(expiresAtMs) || expiresAtMs <= this.#runtime.now()) {
-      throw new TypeError("Sandbox renewal returned an invalid or expired expiresAt value.");
-    }
-    return expiresAtMs;
-  }
-  #schedule(expiresAtMs) {
-    const remainingMs = expiresAtMs - this.#runtime.now();
-    if (!Number.isFinite(remainingMs) || remainingMs <= 0) {
-      throw new TypeError(
-        "The renewed sandbox lease expired before its next renewal was scheduled."
-      );
-    }
-    const delayMs = Math.min(MAX_TIMER_DELAY_MS, Math.max(1, Math.floor(remainingMs / 2)));
-    this.#timer = this.#runtime.setTimeout(() => {
-      this.#timer = void 0;
-      void this.#renewAndSchedule().catch((error) => this.#fail(error));
-    }, delayMs);
-  }
-  async #renewAndSchedule() {
-    const expiresAtMs = await this.#renewExpiry();
-    if (!this.#running) return;
-    this.#expiresAtMs = expiresAtMs;
-    this.#schedule(expiresAtMs);
-  }
-  #fail(error) {
-    if (!this.#running) return;
-    this.#running = false;
-    const handler = this.#failureHandler;
-    this.#failureHandler = void 0;
-    try {
-      handler?.(error);
-    } catch {
-    }
+async function restoreInput(input, wasRaw, wasPaused) {
+  if (wasPaused) {
+    input.pause();
+    await new Promise((resolve) => process.nextTick(resolve));
   }
-};
+  input.setRawMode?.(wasRaw);
+}
 
 // ../setsuna/src/cli-shell.ts
 var DETACH_BYTE = 29;
@@ -2194,7 +2152,7 @@ async function runShellCliCommand(commandName, commandArguments, attachProcessId
   );
   return true;
 }
-async function runShellCommand(commandArguments, attachProcessId, client, io, terminal, leaseRuntime) {
+async function runShellCommand(commandArguments, attachProcessId, client, io, terminal) {
   if (commandArguments.length !== 1 || commandArguments[0] === "") {
     throw new TypeError("setsuna shell requires exactly one sandbox ID.");
   }
@@ -2203,21 +2161,9 @@ async function runShellCommand(commandArguments, attachProcessId, client, io, te
   }
   if (attachProcessId === "") throw new TypeError("--attach requires a process ID.");
   const sandboxId = commandArguments[0];
-  const leaseKeeper = new ActiveLeaseKeeper(client, sandboxId, leaseRuntime);
-  await leaseKeeper.renewNow();
-  try {
-    const size = terminal.size();
-    const processId = await resolveProcess(
-      client,
-      sandboxId,
-      attachProcessId,
-      size,
-      terminal.term()
-    );
-    await attachTerminal(client, sandboxId, processId, io, terminal, leaseKeeper);
-  } finally {
-    leaseKeeper.stop();
-  }
+  const size = terminal.size();
+  const processId = await resolveProcess(client, sandboxId, attachProcessId, size, terminal.term());
+  await attachTerminal(client, sandboxId, processId, io, terminal);
 }
 async function resolveProcess(client, sandboxId, attachProcessId, size, localTerm) {
   if (attachProcessId === void 0) {
@@ -2240,21 +2186,12 @@ async function resolveProcess(client, sandboxId, attachProcessId, size, localTer
   if (process2.state === "running") await client.resizeProcess(sandboxId, attachProcessId, size);
   return attachProcessId;
 }
-async function attachTerminal(client, sandboxId, processId, io, terminal, leaseKeeper) {
+async function attachTerminal(client, sandboxId, processId, io, terminal) {
   const controller = new AbortController();
-  const session = createAttachedSession(
-    client,
-    sandboxId,
-    processId,
-    io,
-    terminal,
-    controller,
-    () => leaseKeeper.stop()
-  );
+  const session = createAttachedSession(client, sandboxId, processId, io, terminal, controller);
   let exitFrame;
   let attachError;
   try {
-    leaseKeeper.start(session.fail);
     for await (const frame of client.attachProcess(sandboxId, processId, {
       maxStreamBytes: Number.MAX_SAFE_INTEGER,
       signal: controller.signal
@@ -2281,20 +2218,20 @@ async function attachTerminal(client, sandboxId, processId, io, terminal, leaseK
   }
   if (exitFrame.exitCode !== null) terminal.setExitCode(exitFrame.exitCode);
 }
-function createAttachedSession(client, sandboxId, processId, io, terminal, controller, stopLeaseKeeper) {
+function createAttachedSession(client, sandboxId, processId, io, terminal, controller) {
   let detached = false;
   let failure;
   let cleaned = false;
   let inputQueue = Promise.resolve();
   let resizeQueue = Promise.resolve();
+  let restored;
   const restoreRawMode = terminal.enterRawMode();
   const cleanup = () => {
     if (cleaned) return;
     cleaned = true;
     io.input.off("data", onInput);
     terminal.offResize(onResize);
-    stopLeaseKeeper();
-    restoreRawMode();
+    restored = restoreRawMode();
   };
   const fail = (error) => {
     if (failure === void 0) failure = error;
@@ -2339,8 +2276,10 @@ function createAttachedSession(client, sandboxId, processId, io, terminal, contr
     get failure() {
       return failure;
     },
+    // Everything the session started has finished, including handing the terminal back.
     async settle() {
       await Promise.allSettled([inputQueue, resizeQueue]);
+      await restored;
     }
   };
 }
@@ -2382,11 +2321,12 @@ function isDetachAbort(error) {
 // ../setsuna/src/cli-interactive-persistent-actions.ts
 function createPersistentInteractiveActions(client, io, shellTerminal) {
   return {
-    async startMicrovm(microvmConfigurationId) {
-      const lease = await client.create({ microvmConfigurationId });
+    async startMicrovm(microvmConfigurationId, duration) {
+      const lease = await client.create({ microvmConfigurationId, duration });
       return {
         sandboxId: lease.sandboxId,
         expiresAt: lease.expiresAt,
+        duration: lease.duration,
         vcpuCount: lease.microvmConfiguration.vcpuCount,
         memoryMiB: lease.microvmConfiguration.memoryMiB
       };
@@ -2403,13 +2343,11 @@ function createPersistentInteractiveActions(client, io, shellTerminal) {
       return (await client.listProcesses(sandboxId)).filter((process2) => process2.state === "running" && process2.terminal !== void 0).map(({ processId, pid }) => ({ processId, pid }));
     },
     async runPersistentCommand(sandboxId, command, timeoutMs) {
-      await client.renew(sandboxId);
       const result = await client.execute(sandboxId, command, {
         ...timeoutMs === void 0 ? {} : { timeoutMs }
       });
       return interactiveRunResult(result);
     },
-    renewMicrovm: (sandboxId) => client.renew(sandboxId),
     destroyMicrovm: (sandboxId) => client.destroy(sandboxId)
   };
 }
@@ -2468,19 +2406,9 @@ var DEFAULT_SIGNAL_RUNTIME = {
 
 // ../setsuna/src/tui/customer/format.ts
 var STANDALONE_BOX = { withGuide: false, width: "auto" };
+var EXIT_MESSAGE = "Sayonara!";
 function formatRunPhase(phase) {
-  switch (phase) {
-    case "starting-microvm":
-      return "Starting microVM";
-    case "microvm-ready":
-      return "microVM ready";
-    case "running-command":
-      return "Running command";
-    case "destroying-microvm":
-      return "Cleaning up";
-    case "microvm-destroyed":
-      return "microVM destroyed";
-  }
+  return phase === "running" ? "Running on Setsuna" : "Complete";
 }
 function formatRunResult(result) {
   const facts = [`Exit status ${result.exitStatus}`, `${result.durationMs} ms`];
@@ -2519,6 +2447,10 @@ function formatMicrovmState(microvm, now) {
   if (microvm.vcpuCount !== void 0 && microvm.memoryMiB !== void 0) {
     lines.push(`Compute     ${formatMicrovmShape(microvm.vcpuCount, microvm.memoryMiB)}`);
   }
+  if (microvm.duration !== void 0) {
+    lines.push(`Duration    ${microvm.duration}`);
+    return lines.join("\n");
+  }
   const remaining = remainingTime(microvm.expiresAt, now);
   lines.push(remaining === void 0 ? "Expired" : `Expires in  ${remaining}`);
   return lines.join("\n");
@@ -2634,7 +2566,7 @@ async function ensureSignedIn(io, auth, promptUi, session = {}) {
       return false;
     }
     if (choice === "exit") {
-      promptUi.outro("Ready when you are.", io);
+      promptUi.outro(EXIT_MESSAGE, io);
       return false;
     }
     status = await signIn(io, auth, promptUi);
@@ -2779,7 +2711,7 @@ async function promptRunAgain(io, promptUi) {
   );
   if (next === TUI_CANCEL || next === "back") return "back-to-main";
   if (next === "exit") {
-    promptUi.outro("Ready when you are.", io);
+    promptUi.outro(EXIT_MESSAGE, io);
     return "exit-tui";
   }
   return "prompt-new-command";
@@ -2834,12 +2766,25 @@ async function startMicrovmMenu(io, actions, promptUi) {
   const configurations = (await actions.microvmConfigurations()).configurations;
   const configuration = await promptForMicrovmConfiguration(io, promptUi, configurations);
   if (configuration === null) return;
-  const sandbox = await startSandbox(io, actions, promptUi, configuration.id);
+  const duration = await promptUi.select(
+    {
+      message: "Duration",
+      options: [
+        { value: "20m", label: "20 minutes" },
+        { value: "1h", label: "1 hour" },
+        { value: "2h", label: "2 hours" }
+      ],
+      initialValue: "20m"
+    },
+    io
+  );
+  if (duration === TUI_CANCEL) return;
+  const sandbox = await startSandbox(io, actions, promptUi, configuration.id, duration);
   if (sandbox === void 0) return;
   promptUi.box(formatMicrovmState(sandbox, Date.now()), "microVM ready", io, STANDALONE_BOX);
   await manageSandbox(io, actions, promptUi, sandbox);
 }
-async function startSandbox(io, actions, promptUi, microvmConfigurationId) {
+async function startSandbox(io, actions, promptUi, microvmConfigurationId, duration) {
   let interrupted = false;
   const spinner = promptUi.spinner(io, {
     indicator: "timer",
@@ -2850,7 +2795,7 @@ async function startSandbox(io, actions, promptUi, microvmConfigurationId) {
   spinner.start("Starting microVM");
   let sandbox;
   try {
-    sandbox = await actions.startMicrovm(microvmConfigurationId);
+    sandbox = await actions.startMicrovm(microvmConfigurationId, duration);
   } catch (error) {
     spinner.error(formatTuiError(error));
     return void 0;
@@ -2876,7 +2821,6 @@ async function activeMicrovmsMenu(io, actions, promptUi) {
   }
 }
 async function selectSandbox(io, promptUi, sandboxes) {
-  const now = Date.now();
   const selected = await promptUi.select(
     {
       message: "Active microVMs",
@@ -2884,7 +2828,7 @@ async function selectSandbox(io, promptUi, sandboxes) {
         ...sandboxes.map((sandbox, index) => ({
           value: `sandbox:${index}`,
           label: sandbox.sandboxId,
-          hint: formatExpiry(sandbox.expiresAt, now)
+          hint: (now) => formatExpiry(sandbox.expiresAt, now)
         })),
         { value: "back", label: "Back" }
       ]
@@ -2897,15 +2841,14 @@ async function selectSandbox(io, promptUi, sandboxes) {
 async function manageSandbox(io, actions, promptUi, initial) {
   let microvm = initial;
   while (true) {
-    const expiry = formatExpiry(microvm.expiresAt, Date.now());
+    const { sandboxId, expiresAt } = microvm;
     const choice = await promptUi.select(
       {
-        message: `Manage microVM ${microvm.sandboxId} \xB7 ${expiry}`,
+        message: (now) => `Manage microVM ${sandboxId} \xB7 ${formatExpiry(expiresAt, now)}`,
         options: [
           { value: "open-terminal", label: "Open terminal" },
           { value: "reattach-terminal", label: "Reattach terminal" },
           { value: "run-command", label: "Run command" },
-          { value: "renew", label: "Renew" },
           { value: "destroy", label: "Destroy microVM" },
           { value: "back", label: "Back" }
         ],
@@ -2926,33 +2869,17 @@ async function manageSandbox(io, actions, promptUi, initial) {
 async function dispatchSandboxChoice(choice, microvm, io, actions, promptUi) {
   if (choice === "open-terminal") {
     await actions.openTerminal(microvm.sandboxId);
-    return refreshExpiry(actions, microvm);
+    return microvm;
   }
   if (choice === "reattach-terminal") {
-    const attached = await reattachTerminal(io, actions, promptUi, microvm.sandboxId);
-    return attached ? refreshExpiry(actions, microvm) : microvm;
+    await reattachTerminal(io, actions, promptUi, microvm.sandboxId);
+    return microvm;
   }
   if (choice === "run-command") {
-    const ran = await runPersistentCommand(io, actions, promptUi, microvm.sandboxId);
-    return ran ? refreshExpiry(actions, microvm) : microvm;
-  }
-  if (choice === "renew") return renewSandbox(io, actions, promptUi, microvm);
-  return await destroySandbox(io, actions, promptUi, microvm.sandboxId) ? void 0 : microvm;
-}
-async function renewSandbox(io, actions, promptUi, microvm) {
-  const status = await actions.renewMicrovm(microvm.sandboxId);
-  promptUi.success(`Renewed \xB7 ${formatExpiry(status.expiresAt, Date.now())}`, io);
-  return { ...microvm, expiresAt: status.expiresAt };
-}
-async function refreshExpiry(actions, microvm) {
-  try {
-    const current = (await actions.activeMicrovms()).find(
-      ({ sandboxId }) => sandboxId === microvm.sandboxId
-    );
-    return current === void 0 ? microvm : { ...microvm, expiresAt: current.expiresAt };
-  } catch {
+    await runPersistentCommand(io, actions, promptUi, microvm.sandboxId);
     return microvm;
   }
+  return await destroySandbox(io, actions, promptUi, microvm.sandboxId) ? void 0 : microvm;
 }
 async function reattachTerminal(io, actions, promptUi, sandboxId) {
   const processes = await actions.terminalProcesses(sandboxId);
@@ -3049,10 +2976,10 @@ async function mainMenu(io, actions, promptUi, session) {
       {
         message: "What would you like to do?",
         options: [
-          { value: "start", label: "Start a microVM", hint: "Create a persistent microVM" },
-          { value: "active", label: "Active microVMs", hint: "Manage persistent microVMs" },
-          { value: "run", label: "Run a command", hint: "Launch a fresh microVM" },
-          { value: "account", label: "Account", hint: "Sign-in status and log out" },
+          { value: "start", label: "New microVM", hint: "For interactive or ongoing work" },
+          { value: "active", label: "Active microVMs", hint: "Resume or manage your microVMs" },
+          { value: "run", label: "One-off run", hint: "Isolated single-run workload" },
+          { value: "account", label: "Account" },
           { value: "exit", label: "Exit" }
         ],
         initialValue: "start",
@@ -3065,7 +2992,7 @@ async function mainMenu(io, actions, promptUi, session) {
       return "exit";
     }
     if (choice === "exit") {
-      promptUi.outro("Ready when you are.", io);
+      promptUi.outro(EXIT_MESSAGE, io);
       return "exit";
     }
     try {
@@ -3091,68 +3018,18 @@ async function dispatchMainChoice(choice, io, actions, promptUi, session) {
   return await accountMenu(io, actions.auth, promptUi, session) === "signed-out" ? "signed-out" : "continue";
 }
 
-// ../setsuna/src/cli-network-options.ts
-var NETWORK_OPTION_NAMES = [
-  "network-mode",
-  "host-ip",
-  "guest-ip",
-  "prefix-length",
-  "uplink-interface",
-  "dns-resolvers",
-  "mtu"
-];
-function routedNetworkFromCli(parsed) {
-  if (!NETWORK_OPTION_NAMES.some((name) => parsed.values[name] !== void 0)) return void 0;
-  if (parsed.values["network-mode"] !== "routed") {
-    throw new TypeError("--network-mode must be routed.");
-  }
-  const hostIp = required(parsed.values["host-ip"], "--host-ip");
-  const guestIp = required(parsed.values["guest-ip"], "--guest-ip");
-  const prefixLength = integer(parsed.values["prefix-length"], "--prefix-length");
-  if (prefixLength !== 30) throw new TypeError("--prefix-length must be 30.");
-  const uplinkInterface = required(parsed.values["uplink-interface"], "--uplink-interface");
-  const dnsResolvers = parsed.values["dns-resolvers"]?.split(",");
-  const mtu = optionalInteger2(parsed.values.mtu, "--mtu");
-  return {
-    mode: "routed",
-    hostIp,
-    guestIp,
-    prefixLength: 30,
-    uplinkInterface,
-    ...dnsResolvers === void 0 ? {} : { dnsResolvers },
-    ...mtu === void 0 ? {} : { mtu }
-  };
-}
-function required(value, name) {
-  if (value === void 0 || value === "") throw new TypeError(`${name} is required.`);
-  return value;
-}
-function integer(value, name) {
-  if (value === void 0 || !/^[0-9]+$/u.test(value)) {
-    throw new TypeError(`${name} must be an integer.`);
-  }
-  const parsed = Number(value);
-  if (!Number.isSafeInteger(parsed)) throw new TypeError(`${name} is too large.`);
-  return parsed;
-}
-function optionalInteger2(value, name) {
-  return value === void 0 ? void 0 : integer(value, name);
-}
-
 // ../setsuna/src/cli-commands.ts
 async function runRunCommand(commandName, commandArguments, parsed, client, requestTimeoutMs, io, options) {
   if (commandName !== "run") throw new TypeError(`Unknown command: ${commandName ?? ""}`);
   if (commandArguments.length === 0)
     throw new TypeError("setsuna run requires a command after --.");
-  const network = routedNetworkFromCli(parsed);
   const result = await runWithSignalCleanup(
     client,
     commandArguments.map(shellQuote).join(" "),
     {
       timeoutMs: optionalInteger(parsed.values["timeout-ms"], "--timeout-ms"),
       requestTimeoutMs,
-      ...parsed.values["configuration-id"] === void 0 ? {} : { microvmConfigurationId: parsed.values["configuration-id"] },
-      ...network === void 0 ? {} : { network }
+      ...parsed.values["configuration-id"] === void 0 ? {} : { microvmConfigurationId: parsed.values["configuration-id"] }
     },
     io,
     options.signalRuntime ?? DEFAULT_SIGNAL_RUNTIME
@@ -3295,8 +3172,56 @@ function exactly(arguments_, count, message) {
   return arguments_;
 }
 
+// ../setsuna/src/cli-network-options.ts
+var NETWORK_OPTION_NAMES = [
+  "network-mode",
+  "host-ip",
+  "guest-ip",
+  "prefix-length",
+  "uplink-interface",
+  "dns-resolvers",
+  "mtu"
+];
+function routedNetworkFromCli(parsed) {
+  if (!NETWORK_OPTION_NAMES.some((name) => parsed.values[name] !== void 0)) return void 0;
+  if (parsed.values["network-mode"] !== "routed") {
+    throw new TypeError("--network-mode must be routed.");
+  }
+  const hostIp = required(parsed.values["host-ip"], "--host-ip");
+  const guestIp = required(parsed.values["guest-ip"], "--guest-ip");
+  const prefixLength = integer(parsed.values["prefix-length"], "--prefix-length");
+  if (prefixLength !== 30) throw new TypeError("--prefix-length must be 30.");
+  const uplinkInterface = required(parsed.values["uplink-interface"], "--uplink-interface");
+  const dnsResolvers = parsed.values["dns-resolvers"]?.split(",");
+  const mtu = optionalInteger2(parsed.values.mtu, "--mtu");
+  return {
+    mode: "routed",
+    hostIp,
+    guestIp,
+    prefixLength: 30,
+    uplinkInterface,
+    ...dnsResolvers === void 0 ? {} : { dnsResolvers },
+    ...mtu === void 0 ? {} : { mtu }
+  };
+}
+function required(value, name) {
+  if (value === void 0 || value === "") throw new TypeError(`${name} is required.`);
+  return value;
+}
+function integer(value, name) {
+  if (value === void 0 || !/^[0-9]+$/u.test(value)) {
+    throw new TypeError(`${name} must be an integer.`);
+  }
+  const parsed = Number(value);
+  if (!Number.isSafeInteger(parsed)) throw new TypeError(`${name} is too large.`);
+  return parsed;
+}
+function optionalInteger2(value, name) {
+  return value === void 0 ? void 0 : integer(value, name);
+}
+
 // ../setsuna/src/cli-sandbox-commands.ts
-var SANDBOX_COMMANDS = /* @__PURE__ */ new Set(["create", "list", "status", "renew", "exec", "destroy"]);
+var SANDBOX_COMMANDS = /* @__PURE__ */ new Set(["create", "list", "status", "exec", "destroy"]);
 async function runSandboxCommand(commandName, commandArguments, parsed, client, requestTimeoutMs, io, options) {
   if (commandName === void 0 || !SANDBOX_COMMANDS.has(commandName)) return false;
   if (commandName === "create") {
@@ -3304,6 +3229,7 @@ async function runSandboxCommand(commandName, commandArguments, parsed, client,
     const network = routedNetworkFromCli(parsed);
     writeLease(
       await client.create({
+        duration: parsed.values.duration ?? "20m",
         ...parsed.values["configuration-id"] === void 0 ? {} : { microvmConfigurationId: parsed.values["configuration-id"] },
         ...network === void 0 ? {} : { network }
       }),
@@ -3317,9 +3243,6 @@ async function runSandboxCommand(commandName, commandArguments, parsed, client,
   } else if (commandName === "status") {
     const sandboxId = requireSandboxId(commandName, commandArguments);
     writeStatus(await client.status(sandboxId), parsed.values.json, io.output, "Sandbox");
-  } else if (commandName === "renew") {
-    const sandboxId = requireSandboxId(commandName, commandArguments);
-    writeStatus(await client.renew(sandboxId), parsed.values.json, io.output, "Renewed sandbox");
   } else if (commandName === "destroy") {
     const sandboxId = requireSandboxId(commandName, commandArguments);
     await client.destroy(sandboxId);
@@ -3401,7 +3324,7 @@ function writeLease(lease, json, output, verb) {
 `);
   else {
     output.write(
-      `${verb} sandbox ${lease.sandboxId} with configuration ${lease.microvmConfiguration.id}; lease expires at ${lease.expiresAt}.
+      `${verb} sandbox ${lease.sandboxId} with configuration ${lease.microvmConfiguration.id}; duration ${lease.duration}, expires at ${lease.expiresAt}.
 `
     );
   }
@@ -3434,6 +3357,8 @@ function writeDestroyed(sandboxId, json, output) {
 
 // ../setsuna/src/cli-client.ts
 async function runClientCli(commandName, commandArguments, parsed, authenticated, io, options) {
+  if (parsed.values.duration !== void 0 && commandName !== "create")
+    throw new TypeError("--duration is supported only by setsuna create.");
   const requestTimeoutMs = optionalInteger(
     parsed.values["request-timeout-ms"],
     "--request-timeout-ms"
@@ -3648,7 +3573,6 @@ function customerSafeSandboxActions(actions) {
     openTerminal: customerSafe(actions.openTerminal),
     terminalProcesses: customerSafe(actions.terminalProcesses),
     runPersistentCommand: customerSafe(actions.runPersistentCommand),
-    renewMicrovm: customerSafe(actions.renewMicrovm),
     destroyMicrovm: customerSafe(actions.destroyMicrovm)
   };
 }
@@ -3677,10 +3601,9 @@ var PREVIEW_HELP = `Usage:
   setsuna auth logout [--json]
   setsuna health [--json]
   setsuna configurations [--json]
-  setsuna create [--configuration-id ID] [--request-timeout-ms MS] [--json]
+  setsuna create [--duration 20m|1h|2h] [--configuration-id ID] [--request-timeout-ms MS] [--json]
   setsuna list [--request-timeout-ms MS] [--json]
   setsuna status SANDBOX_ID [--request-timeout-ms MS] [--json]
-  setsuna renew SANDBOX_ID [--request-timeout-ms MS] [--json]
   setsuna exec SANDBOX_ID [--timeout-ms MS] [--request-timeout-ms MS] [--json] -- COMMAND [ARG...]
   setsuna destroy SANDBOX_ID [--request-timeout-ms MS] [--json]
   setsuna shell SANDBOX_ID [--attach PROCESS_ID] [--request-timeout-ms MS]
@@ -3697,8 +3620,7 @@ Commands:
   configurations List available microVM configurations.
   create  Create a persistent sandbox with a selected or default configuration.
   list    List active persistent sandboxes.
-  status  Inspect an active persistent sandbox lease.
-  renew   Extend an active persistent sandbox lease.
+  status  Inspect an active persistent sandbox.
   exec    Execute a command without destroying the persistent sandbox.
   destroy Explicitly destroy a persistent sandbox.
   shell   Open an interactive shell in a persistent sandbox, or reattach to one.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "setsuna-microvm",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Command-line interface for the Setsuna Research Preview.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://semswitch.com/setsuna",