@computesdk/cli 2.1.0 → 2.1.1

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

@@ -1872,8 +1872,82 @@ 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 });
+  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("--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) => {
     try {
       const c = await client(opts);
@@ -1928,8 +2002,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 +2027,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`,