@computesdk/cli 2.1.0 → 2.2.0

package/README.md

@@ -44,6 +44,17 @@ override, pass `--org <slug>` (on the root command or any `sandboxes` /
 on the request. Precedence: `--org` > `COMPUTE_ORG` > the stored login's org.
 The platform ignores the header for org API keys.
 
+For `compute sandboxes exec` and `compute sandboxes spawn`, everything after
+the command's first word goes to the sandbox untouched — flags like `uname
+-a` or `node -e` are not CLI options. Pass CLI options (`--json`,
+`--timeout-ms`, `--cwd`, `-e/--env`, `--stdin`, `--org`) before the command;
+a bare `--` before the command is optional but supported.
+
+```bash
+compute sandboxes exec sb1 uname -a
+compute sandboxes spawn sb1 --cwd /app -e NODE_ENV=production -- npm run dev
+```
+
 ## Migrating from @computesdk/cli 1.x
 
 v2 removes the legacy console authentication and its commands:

package/dist/index.js

@@ -835,15 +835,15 @@ function maxPriceFields(maxBid, maxBidPer) {
     throw new ActionsCliError("invalid_argument", "--max-bid-per requires --max-bid.");
   }
   if (maxBid === void 0) return void 0;
-  const usd = Number(maxBid);
-  if (!/^\d+(\.\d+)?([eE][+-]?\d+)?$/.test(maxBid) || !Number.isFinite(usd) || usd <= 0) {
+  const usd2 = Number(maxBid);
+  if (!/^\d+(\.\d+)?([eE][+-]?\d+)?$/.test(maxBid) || !Number.isFinite(usd2) || usd2 <= 0) {
     throw new ActionsCliError("invalid_argument", `Invalid --max-bid "${maxBid}". Expected a positive dollar amount (e.g. 0.12).`);
   }
   const per = maxBidPer ?? "second";
   if (per !== "second" && per !== "minute" && per !== "hour") {
     throw new ActionsCliError("invalid_argument", `--max-bid-per must be second, minute, or hour, got "${maxBidPer}".`);
   }
-  return { maxPriceUsd: usd, maxPricePer: per };
+  return { maxPriceUsd: usd2, maxPricePer: per };
 }
 function parseVaultKind(kind) {
   if (kind === void 0 || kind === "secret" || kind === "variable") return kind ?? "secret";
@@ -1377,8 +1377,8 @@ function parseRate(price, per) {
   if (price === void 0) {
     throw new ActionsCliError("invalid_argument", "A price is required \u2014 pass --price <usd>.");
   }
-  const usd = Number(price);
-  if (!USD_RE.test(price) || !Number.isFinite(usd) || usd <= 0) {
+  const usd2 = Number(price);
+  if (!USD_RE.test(price) || !Number.isFinite(usd2) || usd2 <= 0) {
     throw new ActionsCliError(
       "invalid_argument",
       `Invalid --price "${price}". Expected a positive dollar amount (e.g. 0.12).`
@@ -1391,7 +1391,7 @@ function parseRate(price, per) {
       `--per must be second, minute, or hour, got "${per}".`
     );
   }
-  return { usd, per: unit };
+  return { usd: usd2, per: unit };
 }
 function parseCapacity(value) {
   if (value === void 0) return void 0;
@@ -1493,11 +1493,11 @@ function credentialBody(fields, values) {
   }
   return { fields: values };
 }
-function formatUsd(usd) {
-  return `$${usd.toFixed(6).replace(/\.?0+$/, "")}`;
+function formatUsd(usd2) {
+  return `$${usd2.toFixed(6).replace(/\.?0+$/, "")}`;
 }
-function formatRate(usd, per) {
-  return `${formatUsd(usd)}/${per}`;
+function formatRate(usd2, per) {
+  return `${formatUsd(usd2)}/${per}`;
 }
 function formatListingStatus(ask) {
   let label;
@@ -1843,6 +1843,33 @@ ${hints}`
 
 // src/sandboxes.ts
 import pc3 from "picocolors";
+function parseMaxPrice(value, per) {
+  if (value === void 0) {
+    if (per !== void 0) throw new Error("--max-price-per requires --max-price.");
+    return void 0;
+  }
+  let usdText = value;
+  let unit = per;
+  const slash = value.indexOf("/");
+  if (slash !== -1) {
+    usdText = value.slice(0, slash);
+    const inline = value.slice(slash + 1);
+    if (per !== void 0 && per !== inline) {
+      throw new Error(`--max-price "${value}" conflicts with --max-price-per "${per}".`);
+    }
+    unit = inline;
+  }
+  const usd2 = Number(usdText);
+  if (!/^\d+(\.\d+)?([eE][+-]?\d+)?$/.test(usdText) || !Number.isFinite(usd2) || usd2 <= 0) {
+    throw new Error(`Invalid --max-price "${value}". Expected a positive dollar amount like 0.12/hour.`);
+  }
+  if (unit !== "second" && unit !== "minute" && unit !== "hour") {
+    throw new Error(
+      "--max-price needs a unit \u2014 write it as <usd>/<unit> (e.g. --max-price 0.12/hour) or pass --max-price-per hour."
+    );
+  }
+  return { usd: usd2, per: unit };
+}
 function shellQuote(arg) {
   return `'${arg.replace(/'/g, `'\\''`)}'`;
 }
@@ -1854,12 +1881,40 @@ function printSandbox(s) {
     console.log(`  image: ${s.image ?? "\u2014"}${s.requestedImage !== null && s.requestedImage !== s.image ? `  ${pc3.dim(`(requested: ${s.requestedImage})`)}` : ""}`);
   }
   if (s.destroyError) console.log(`  destroyError: ${pc3.red(s.destroyError)}`);
+  if (s.placement) {
+    const p2 = s.placement;
+    const box = p2.box ? ` / ${p2.box.sizeName ?? "custom"}${p2.box.resources ? ` (${p2.box.resources.cpus ?? "?"} vCPU / ${p2.box.resources.memoryMb ?? "?"} MB)` : ""}` : "";
+    console.log(
+      `  provider: ${p2.box?.provider ?? s.provider ?? "\u2014"}${box}   size: ${p2.size ?? "\u2014"}   order: ${p2.orderType ?? "\u2014"}   rate: $${p2.rate.usd}/${p2.rate.per}`
+    );
+  }
   if (attach !== void 0) {
     console.log(
       attach === null ? "  attach: none (market fill or ambient provider \u2014 platform drive only)" : `  attach: ${attach.provider} / ${attach.providerSandboxId}${attach.region ? ` (${attach.region})` : ""}`
     );
   }
 }
+var usd = (n, suffix = "") => n === void 0 ? "\u2014" : `$${n.toFixed(4).replace(/0+$/, "").replace(/\.$/, ".00")}${suffix}`;
+function printQuote(q, timeoutMs) {
+  console.log(`quote: ${q.ok ? pc3.green("ok") : pc3.red(q.reason ?? "unfillable")}`);
+  const box = q.placement?.box;
+  console.log(
+    `  size: ${q.placement?.size ?? "\u2014"}   provider: ${q.placement?.provider ?? "\u2014"}` + (box ? `   box: ${box.sizeName ?? "custom"} (${box.provider}${box.resources ? `, ${box.resources.cpus ?? "?"} vCPU / ${box.resources.memoryMb ?? "?"} MB` : ""})` : "")
+  );
+  console.log(`  order type: ${q.orderType}   order: ${q.providerOrder.join(", ")}`);
+  if (q.rateUsd) {
+    console.log(`  rate: ${usd(q.rateUsd.perHour, "/hour")}   cheapest live: ${usd(q.cheapestLiveUsdPerHour, "/hr")}   reference: ${usd(q.referenceUsdPerHour, "/hr")}`);
+  } else if (q.rate) {
+    console.log(`  rate: $${q.rate.usd}/${q.rate.per}`);
+  }
+  const timeout = timeoutMs !== void 0 ? ` for ${timeoutMs}ms` : "";
+  console.log(`  est. cost${timeout}: ${usd(q.estimatedCostUsd)}   required hold: ${usd(q.requiredHoldUsd)}`);
+  console.log(
+    `  cap: ${q.maxPrice ? `$${q.maxPrice.usd}/${q.maxPrice.per}` : usd(q.marketCapUsdPerHour, "/hr")}   protection limit: ${usd(q.protectionLimitUsdPerHour, "/hr")}   balance: ${usd(q.creditBalanceUsd)}`
+  );
+  if (!q.ok && q.topUpPath) console.log(`  ${pc3.dim(`\u2192 ${q.topUpPath}`)}`);
+  if (q.liveAskDepth !== void 0) console.log(`  ${pc3.dim(`live asks: ${q.liveAskDepth}`)}`);
+}
 function printProcess(p2) {
   const exit = p2.status === "exited" ? `exit=${p2.exitCode ?? "?"}${p2.signal ? ` (${p2.signal})` : ""}` : "";
   const stdin = p2.stdin && p2.status === "running" ? "  [stdin open]" : "";
@@ -1872,9 +1927,83 @@ function printSnapshot(s) {
     `  provider: ${s.provider}${s.region ? ` (${s.region})` : ""}   label: ${s.label ?? "\u2014"}   created: ${s.createdAt}${s.expiresAt ? `   expires: ${s.expiresAt}` : ""}`
   );
 }
+var AUTH_LEAD_OPTS = [
+  { aliases: ["--api-key"], key: "apiKey", flag: "value" },
+  { aliases: ["--base-url"], key: "baseUrl", flag: "value" },
+  { aliases: ["--allow-untrusted-host"], key: "allowUntrustedHost", flag: "bool" },
+  { aliases: ["--org"], key: "org", flag: "value" },
+  { aliases: ["--json"], key: "json", flag: "bool" }
+];
+var EXEC_LEAD_OPTS = [
+  ...AUTH_LEAD_OPTS,
+  { aliases: ["--timeout-ms"], key: "timeoutMs", flag: "value" }
+];
+var SPAWN_LEAD_OPTS = [
+  ...AUTH_LEAD_OPTS,
+  { aliases: ["--cwd"], key: "cwd", flag: "value" },
+  { aliases: ["-e", "--env"], key: "env", flag: "repeat" },
+  { aliases: ["--stdin"], key: "stdin", flag: "bool" }
+];
+function takeLeadingOptions(argv, specs) {
+  var _a;
+  const byAlias = /* @__PURE__ */ new Map();
+  for (const spec of specs) for (const alias of spec.aliases) byAlias.set(alias, spec);
+  const inline = {};
+  let i = 0;
+  for (; i < argv.length; i++) {
+    const token = argv[i];
+    if (token === "--") {
+      i++;
+      break;
+    }
+    if (!token.startsWith("-") || token === "-") break;
+    const eq = token.indexOf("=");
+    const flag = eq === -1 ? token : token.slice(0, eq);
+    let spec = byAlias.get(flag);
+    let attached;
+    if (!spec && !flag.startsWith("--") && flag.length > 2) {
+      const shortSpec = byAlias.get(flag.slice(0, 2));
+      if (shortSpec && shortSpec.flag !== "bool") {
+        spec = shortSpec;
+        attached = flag.slice(2);
+        if (attached.startsWith("=")) attached = attached.slice(1);
+        if (eq !== -1) attached += token.slice(eq);
+      }
+    }
+    if (!spec) {
+      throw new Error(
+        `unknown option '${flag}' \u2014 pass CLI options before the command, or use -- to separate them`
+      );
+    }
+    if (spec.flag === "bool") {
+      if (eq !== -1) throw new Error(`option '${flag}' takes no value`);
+      inline[spec.key] = true;
+    } else {
+      const value = attached ?? (eq !== -1 ? token.slice(eq + 1) : argv[++i]);
+      if (value === void 0) throw new Error(`option '${flag}' requires a value`);
+      if (spec.flag === "repeat") {
+        (inline[_a = spec.key] ?? (inline[_a] = [])).push(value);
+      } else {
+        inline[spec.key] = value;
+      }
+    }
+  }
+  return { command: argv.slice(i), inline };
+}
+function mergeLeadOpts(opts, inline) {
+  const merged = { ...opts };
+  for (const [key, value] of Object.entries(inline)) {
+    if (Array.isArray(value)) {
+      merged[key] = [...merged[key] ?? [], ...value];
+    } else {
+      merged[key] = value;
+    }
+  }
+  return merged;
+}
 function registerSandboxesCommands(program2) {
-  const cmd = program2.command("sandboxes").alias("sbx").description("Create and drive sandboxes through the platform").configureOutput({ outputError: usageErrorOutput });
-  cmd.command("create").description('Place a sandbox (provider order walks 1,2,3; "market" bids first)').option("--order <providers>", 'provider order, comma-separated (e.g. "market,blaxel,vercel")').option("--label <label>", "label for the sandbox").option("--image <image>", "container image to boot").option("--snapshot-id <id>", "provider snapshot to resume").option("--cpus <n>", "CPU cores").option("--memory-mb <n>", "memory in MB").option("--disk-mb <n>", "ephemeral disk in MB").option("--timeout-ms <ms>", "sandbox timeout in ms").option("--secret <name>", "vault secret name to inject (repeatable)", (v, a) => a.concat(v), []).option("--api-key <key>", "platform API key (or COMPUTE_API_KEY)").option("--base-url <url>", "platform base URL").option("--allow-untrusted-host", "allow non-computesdk.com base URLs").option("--json", "print the raw response").action(async (opts) => {
+  const cmd = program2.command("sandboxes").alias("sbx").description("Create and drive sandboxes through the platform").enablePositionalOptions().configureOutput({ outputError: usageErrorOutput });
+  cmd.command("create").description('Place a sandbox (provider order walks 1,2,3; "market" bids first)').option("--order <providers>", 'provider order, comma-separated (e.g. "market,blaxel,vercel")').option("--size <size>", "platform size: small (1 vCPU/2 GB), medium, large, xlarge (8/16 GB); default medium").option("--label <label>", "label for the sandbox").option("--image <image>", "container image to boot").option("--snapshot-id <id>", "provider snapshot to resume").option("--cpus <n>", "CPU cores (raw resources \u2014 mutually exclusive with --size)").option("--memory-mb <n>", "memory in MB (raw resources)").option("--disk-mb <n>", "ephemeral disk in MB (raw resources)").option("--max-price <usd/unit>", "max price for a market fill (e.g. 0.12/hour); makes the create a limit order").option("--max-price-per <unit>", "unit for a bare --max-price usd (second, minute, or hour)").option("--market", 'place the create on the compute market (order type "market")').option("--order-type <type>", "explicit market order type: market or limit").option("--timeout-ms <ms>", "sandbox timeout in ms").option("--secret <name>", "vault secret name to inject (repeatable)", (v, a) => a.concat(v), []).option("--api-key <key>", "platform API key (or COMPUTE_API_KEY)").option("--base-url <url>", "platform base URL").option("--allow-untrusted-host", "allow non-computesdk.com base URLs").option("--json", "print the raw response").action(async (opts) => {
     try {
       const c = await client(opts);
       const resources = {};
@@ -1883,18 +2012,55 @@ function registerSandboxesCommands(program2) {
       if (opts.diskMb) resources.ephemeralDiskMb = Number(opts.diskMb);
       const body = {};
       if (opts.order) body.providerOrder = opts.order.split(",").map((s) => s.trim());
+      if (opts.size) body.size = opts.size;
       if (opts.label) body.label = opts.label;
       if (opts.image) body.image = opts.image;
       if (opts.snapshotId) body.snapshotId = opts.snapshotId;
       if (opts.timeoutMs) body.timeoutMs = Number(opts.timeoutMs);
       if (opts.secret && opts.secret.length > 0) body.secrets = opts.secret;
       if (Object.keys(resources).length > 0) body.resources = resources;
+      const maxPrice = parseMaxPrice(opts.maxPrice, opts.maxPricePer);
+      if (maxPrice) body.maxPrice = { usd: maxPrice.usd, per: maxPrice.per };
+      if (opts.orderType && opts.market) {
+        throw new Error("--market and --order-type are mutually exclusive.");
+      }
+      if (opts.orderType) body.orderType = opts.orderType;
+      if (opts.market) body.orderType = "market";
       const res = await c.post("/api/v1/sandboxes", body);
       output(opts, res.sandbox, printSandbox);
     } catch (e) {
       fail(e, opts);
     }
   });
+  cmd.command("quote").description("Quote a sandbox create: placement, rate, caps and credits \u2014 creates nothing").option("--size <size>", "platform size (or raw resource flags; default medium)").option("--cpus <n>", "CPU cores").option("--memory-mb <n>", "memory in MB").option("--disk-mb <n>", "ephemeral disk in MB").option("--region <region>", "pin the placement region").option("--timeout-ms <ms>", "sandbox timeout in ms").option("--order-type <type>", "market order type: market or limit").option("--market", "quote a market order (fills at the live price, protection-bounded)").option("--max-price <usd/unit>", "max price for a market fill (e.g. 0.12/hour)").option("--max-price-per <unit>", "unit for a bare --max-price usd (second, minute, or hour)").option("--api-key <key>").option("--base-url <url>").option("--allow-untrusted-host").option("--json", "print the raw response").action(async (opts) => {
+    try {
+      const c = await client(opts);
+      const params = {
+        size: opts.size,
+        cpus: opts.cpus,
+        memoryMb: opts.memoryMb,
+        ephemeralDiskMb: opts.diskMb,
+        region: opts.region,
+        timeoutMs: opts.timeoutMs,
+        orderType: opts.market ? "market" : opts.orderType
+      };
+      if (opts.orderType && opts.market) {
+        throw new Error("--market and --order-type are mutually exclusive.");
+      }
+      const maxPrice = parseMaxPrice(opts.maxPrice, opts.maxPricePer);
+      if (maxPrice) {
+        params.maxPriceUsd = String(maxPrice.usd);
+        params.maxPricePer = maxPrice.per;
+      }
+      const res = await c.get(
+        "/api/v1/sandboxes/quote",
+        params
+      );
+      output(opts, res.quote, (quote) => printQuote(quote, opts.timeoutMs));
+    } catch (e) {
+      fail(e, opts);
+    }
+  });
   cmd.command("list").description("List sandboxes").option("--status <status>", "creating | running | destroyed").option("--limit <n>", "page size").option("--cursor <cursor>", "page cursor from a previous response").option("--api-key <key>").option("--base-url <url>").option("--allow-untrusted-host").option("--json", "print the raw response").action(async (opts) => {
     try {
       const c = await client(opts);
@@ -1928,8 +2094,13 @@ function registerSandboxesCommands(program2) {
       fail(e, opts);
     }
   });
-  cmd.command("exec <sandboxId> <command...>").description("Run a one-shot command and print its result").option("--timeout-ms <ms>", "command timeout in ms").option("--api-key <key>").option("--base-url <url>").option("--allow-untrusted-host").option("--json", "print the raw response").action(async (sandboxId, command, opts) => {
+  cmd.command("exec <sandboxId> <command...>").description("Run a one-shot command and print its result (options before the command; -- also works)").option("--timeout-ms <ms>", "command timeout in ms").option("--api-key <key>").option("--base-url <url>").option("--allow-untrusted-host").option("--json", "print the raw response").passThroughOptions().action(async (sandboxId, rawCommand, rawOpts) => {
+    let opts = rawOpts;
     try {
+      const lead = takeLeadingOptions(rawCommand, EXEC_LEAD_OPTS);
+      opts = mergeLeadOpts(rawOpts, lead.inline);
+      const command = lead.command;
+      if (command.length === 0) throw new Error("missing command to run");
       const c = await client(opts);
       const res = await c.post(
         `/api/v1/sandboxes/${sandboxId}/commands`,
@@ -1948,8 +2119,13 @@ function registerSandboxesCommands(program2) {
       fail(e, opts);
     }
   });
-  cmd.command("spawn <sandboxId> <command...>").description("Start a detached process that outlives this request").option("--cwd <dir>", "working directory").option("-e, --env <key=value>", "environment variable (repeatable)", (v, a) => a.concat(v), []).option("--stdin", "keep the process's stdin pipe open for `stdin`/`close-stdin`").option("--api-key <key>").option("--base-url <url>").option("--allow-untrusted-host").option("--json", "print the raw response").action(async (sandboxId, command, opts) => {
+  cmd.command("spawn <sandboxId> <command...>").description("Start a detached process that outlives this request (options before the command; -- also works)").option("--cwd <dir>", "working directory").option("-e, --env <key=value>", "environment variable (repeatable)", (v, a) => a.concat(v), []).option("--stdin", "keep the process's stdin pipe open for `stdin`/`close-stdin`").option("--api-key <key>").option("--base-url <url>").option("--allow-untrusted-host").option("--json", "print the raw response").passThroughOptions().action(async (sandboxId, rawCommand, rawOpts) => {
+    let opts = rawOpts;
     try {
+      const lead = takeLeadingOptions(rawCommand, SPAWN_LEAD_OPTS);
+      opts = mergeLeadOpts(rawOpts, lead.inline);
+      const command = lead.command;
+      if (command.length === 0) throw new Error("missing command to spawn");
       const c = await client(opts);
       const res = await c.post(
         `/api/v1/sandboxes/${sandboxId}/processes`,