@computesdk/cli 2.0.0 → 2.1.1

package/README.md

@@ -29,11 +29,32 @@ compute market …                # sell side of the compute market
 compute sandboxes …             # platform sandbox control plane
 compute bench …                 # benchmarks CLI (run, auth, org, results, …)
 compute providers               # sandbox provider credential status
+compute org list                # your organizations (* = active)
+compute org use <slug>          # switch the stored login's active org
+compute org current / whoami    # current user + active org
 ```
 
 All platform commands accept `--api-key` / `COMPUTE_API_KEY` and fall back to
 the stored OAuth credentials.
 
+The active org comes from the stored login (`compute org use` changes it —
+it's per user, so every CLI on every machine sees the switch). For a one-off
+override, pass `--org <slug>` (on the root command or any `sandboxes` /
+`actions` / `market` subcommand) or set `COMPUTE_ORG`; it sends `X-Org-Slug`
+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

@@ -54,12 +54,6 @@ function isProviderAuthComplete(provider) {
 }
 function getProviderStatus() {
   const statuses = [];
-  const hasGatewayKey = !!process.env.COMPUTESDK_API_KEY;
-  statuses.push({
-    name: "computesdk",
-    ready: hasGatewayKey,
-    missing: hasGatewayKey ? [] : ["COMPUTESDK_API_KEY"]
-  });
   for (const provider of PROVIDER_NAMES) {
     statuses.push({
       name: provider,
@@ -262,7 +256,12 @@ var ActionsClient = class {
     return new Uint8Array(await res.arrayBuffer());
   }
   headers() {
-    return { authorization: `Bearer ${this.auth.apiKey}`, accept: "application/json" };
+    const headers = {
+      authorization: `Bearer ${this.auth.apiKey}`,
+      accept: "application/json"
+    };
+    if (this.auth.orgSlug) headers["X-Org-Slug"] = this.auth.orgSlug;
+    return headers;
   }
   async parse(res) {
     const body = await res.json().catch(() => void 0);
@@ -336,6 +335,7 @@ var NO_CREDENTIALS_HINT = "Set COMPUTE_API_KEY, pass --api-key, or run `compute
 async function resolveActionsAuth(opts, resolveStored = resolveStoredPlatformAuth) {
   const baseUrl = (opts.baseUrl || process.env.COMPUTE_PLATFORM_URL || process.env.BENCHMARKS_PLATFORM_URL || // legacy name
   DEFAULT_BASE_URL).replace(/\/+$/, "");
+  let orgSlug = opts.org || process.env.COMPUTE_ORG || void 0;
   if (!opts.allowUntrustedHost && !isTrustedActionsHost(baseUrl)) {
     throw new ActionsCliError(
       "untrusted_host",
@@ -370,12 +370,12 @@ async function resolveActionsAuth(opts, resolveStored = resolveStoredPlatformAut
   if (!apiKey) {
     throw new ActionsCliError("no_credentials", `No API key. ${NO_CREDENTIALS_HINT}`);
   }
-  return { apiKey, baseUrl };
+  return { apiKey, baseUrl, ...orgSlug && { orgSlug } };
 }
 async function resolveStoredPlatformAuth(opts) {
   const { resolveAuth } = await import("@benchsdk/cli");
   const auth = await resolveAuth({ baseUrl: opts.baseUrl });
-  return { apiKey: auth.apiKey, token: auth.token };
+  return { apiKey: auth.apiKey, token: auth.token, orgSlug: auth.orgSlug, orgId: auth.orgId };
 }
 function isLoopbackHost(host) {
   return host === "localhost" || host === "127.0.0.1" || host === "[::1]" || host === "::1";
@@ -883,7 +883,7 @@ function formatVaultRow(item) {
 }
 function registerActionsCommands(program2) {
   const actions = program2.command("actions").alias("ci").description("Drive the benchmarks-platform Actions API").configureOutput({ outputError: usageErrorOutput });
-  const common = (cmd) => cmd.option("--api-key <key>", "API key (default: $COMPUTE_API_KEY)").option("--base-url <url>", "API base URL (default: https://platform.computesdk.com)").option("--allow-untrusted-host", "send an explicit --api-key/env key to a non-computesdk, non-localhost --base-url (stored login credentials are never sent)").option("--json", "print machine-readable JSON");
+  const common = (cmd) => cmd.option("--api-key <key>", "API key (default: $COMPUTE_API_KEY)").option("--base-url <url>", "API base URL (default: https://platform.computesdk.com)").option("--org <slug>", "organization slug for this command (or $COMPUTE_ORG)").option("--allow-untrusted-host", "send an explicit --api-key/env key to a non-computesdk, non-localhost --base-url (stored login credentials are never sent)").option("--json", "print machine-readable JSON");
   common(
     actions.command("dispatch").description("Dispatch a workflow_dispatch run (or any workflow with --manual)").argument("<repo>", "repository in owner/repo format").requiredOption("--workflow <path|name>", "workflow path or name").option("--ref <ref>", "git ref to run (default: the workflow's first watched ref)").option("--inputs <pairs...>", "workflow inputs as key=value (workflow_dispatch inputs only)").option("--manual", "run a workflow even if it does not declare workflow_dispatch (such runs take no --inputs)").option("--provider <id>", "place the run on one provider (e.g. namespace, vercel:sfo1) instead of the org provider order").option("--provider-region <region>", "region for --provider (same as --provider <id>:<region>)").option("--max-bid <usd>", "max price per vCPU for a market fill (e.g. 0.12); unfilled jobs fall through to the next provider").option("--max-bid-per <unit>", "time unit --max-bid is priced in: second, minute, or hour (default: second)")
   ).action(async (repo, opts) => {
@@ -906,8 +906,8 @@ function registerActionsCommands(program2) {
         "/api/v1/actions/dispatch",
         body
       );
-      const org = await c.org();
-      const url = `${c.baseUrl}/${org.slug}/actions/runs/${result.runId}`;
+      const org2 = await c.org();
+      const url = `${c.baseUrl}/${org2.slug}/actions/runs/${result.runId}`;
       output(opts, { ...result, url }, (r) => {
         console.log(`${r.created ? "dispatched" : "already running"}  ${pc.cyan(r.runId)}`);
         console.log(`sha: ${r.headSha}`);
@@ -965,8 +965,8 @@ function registerActionsCommands(program2) {
     try {
       const c = await client(opts);
       const run = await c.get(`/api/v1/actions/runs/${runId}`);
-      const org = await c.org();
-      const url = `${c.baseUrl}/${org.slug}/actions/runs/${run.id}`;
+      const org2 = await c.org();
+      const url = `${c.baseUrl}/${org2.slug}/actions/runs/${run.id}`;
       const summary = run.conclusion === "failed" ? await fetchRunSummary(c, runId) : null;
       output(opts, { ...run, url, summary }, (r) => {
         console.log(formatRunDetail(r, r.url));
@@ -1301,8 +1301,8 @@ function registerActionsCommands(program2) {
       const result = await c.post(
         `/api/v1/actions/runs/${runId}/rerun`
       );
-      const org = await c.org();
-      const url = `${c.baseUrl}/${org.slug}/actions/runs/${result.runId}`;
+      const org2 = await c.org();
+      const url = `${c.baseUrl}/${org2.slug}/actions/runs/${result.runId}`;
       output(opts, { ...result, url }, (r) => {
         console.log(`${r.created ? "rerun dispatched" : "rerun already running"}  ${pc.cyan(r.runId)}`);
         console.log(`url: ${r.url}`);
@@ -1609,7 +1609,7 @@ function formatSettlementRow(s) {
 }
 function registerMarketCommands(program2) {
   const market = program2.command("market").description("Sell compute capacity on the compute market").configureOutput({ outputError: usageErrorOutput });
-  const common = (cmd) => cmd.option("--api-key <key>", "API key (default: $COMPUTE_API_KEY)").option("--base-url <url>", "API base URL (default: https://platform.computesdk.com)").option("--allow-untrusted-host", "send an explicit --api-key/env key to a non-computesdk, non-localhost --base-url (stored login credentials are never sent)").option("--json", "print machine-readable JSON");
+  const common = (cmd) => cmd.option("--api-key <key>", "API key (default: $COMPUTE_API_KEY)").option("--base-url <url>", "API base URL (default: https://platform.computesdk.com)").option("--org <slug>", "organization slug for this command (or $COMPUTE_ORG)").option("--allow-untrusted-host", "send an explicit --api-key/env key to a non-computesdk, non-localhost --base-url (stored login credentials are never sent)").option("--json", "print machine-readable JSON");
   common(
     market.command("listings").alias("list").description("Your listings \u2014 live, paused, expired, and withdrawn")
   ).action(async (opts) => {
@@ -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`,
@@ -2199,6 +2283,9 @@ function registerSandboxesCommands(program2) {
       fail(e, opts);
     }
   });
+  for (const sub of cmd.commands) {
+    sub.option("--org <slug>", "organization slug for this command (or $COMPUTE_ORG)");
+  }
 }
 async function followProcess(c, sandboxId, jobId) {
   let exitCode = 0;
@@ -2234,17 +2321,41 @@ var isDevBuild = import.meta.url.includes("worktrees") || import.meta.url.includ
 var VERSION = isDevBuild ? `${packageJson.version}-dev` : packageJson.version;
 var program = new Command();
 program.name("compute").description("ComputeSDK CLI").version(VERSION).enablePositionalOptions().passThroughOptions();
+function envBaseUrl() {
+  return process.env.COMPUTE_PLATFORM_URL ?? process.env.BENCHMARKS_PLATFORM_URL;
+}
+async function benchAuth(opts = {}) {
+  const { resolveAuth } = await import("@benchsdk/cli");
+  return resolveAuth({ baseUrl: opts.baseUrl ?? envBaseUrl() });
+}
+async function printSessionLine(options) {
+  try {
+    const { getMe } = await import("@benchsdk/cli");
+    const me = await getMe(await benchAuth({ baseUrl: options?.baseUrl }));
+    const active = me.organizations.find((o) => o.id === me.activeOrganizationId);
+    const who = me.user.email ?? me.user.name ?? me.user.id;
+    if (active) {
+      p.log.success(
+        `Logged in as ${who} \u2014 active org: ${active.slug}. Change with \`compute org use <slug>\`.`
+      );
+    } else {
+      p.log.success(`Logged in as ${who} \u2014 no active org`);
+    }
+  } catch {
+    p.log.warn("Logged in, but could not fetch session info.");
+  }
+}
 async function runLogin(options) {
   const { oauthLogin } = await import("@benchsdk/cli");
   await oauthLogin({
-    baseUrl: options?.baseUrl ?? process.env.COMPUTE_PLATFORM_URL ?? process.env.BENCHMARKS_PLATFORM_URL
+    baseUrl: options?.baseUrl ?? envBaseUrl()
   });
 }
 async function runLogout() {
   const { clearCredentials } = await import("@benchsdk/cli");
   await clearCredentials();
 }
-program.option("--login", "force re-authentication").option("--logout", "clear stored credentials").action(async (opts) => {
+program.option("--login", "force re-authentication").option("--logout", "clear stored credentials").option("--org <slug>", "organization slug override for this invocation (or $COMPUTE_ORG)").action(async (opts) => {
   if (opts.logout) {
     console.log();
     p.intro(pc4.cyan(`@computesdk/cli v${VERSION}`));
@@ -2257,11 +2368,16 @@ program.option("--login", "force re-authentication").option("--logout", "clear s
     console.log();
     p.intro(pc4.cyan(`@computesdk/cli v${VERSION}`));
     await runLogin();
+    await printSessionLine();
     p.outro(pc4.green("Authenticated!"));
     process.exit(0);
   }
   program.help();
 });
+program.hook("preAction", (thisCommand) => {
+  const org2 = thisCommand.opts().org;
+  if (org2) process.env.COMPUTE_ORG = org2;
+});
 program.command("providers").description("List all providers and their configuration status").action(async () => {
   console.log();
   p.intro(pc4.cyan(`@computesdk/cli v${VERSION}`));
@@ -2279,6 +2395,7 @@ program.command("login").description("Authenticate with ComputeSDK (OAuth device
   console.log();
   p.intro(pc4.cyan(`@computesdk/cli v${VERSION}`));
   await runLogin({ baseUrl: opts.baseUrl });
+  await printSessionLine({ baseUrl: opts.baseUrl });
   p.outro(pc4.green("Authenticated!"));
 });
 program.command("logout").description("Clear stored credentials").action(async () => {
@@ -2288,6 +2405,57 @@ program.command("logout").description("Clear stored credentials").action(async (
   p.log.success("Logged out. Stored credentials removed.");
   p.outro(pc4.green("Done!"));
 });
+async function printWhoami() {
+  const { getMe } = await import("@benchsdk/cli");
+  const me = await getMe(await benchAuth());
+  const active = me.organizations.find((o) => o.id === me.activeOrganizationId);
+  console.log(me.user.email ?? me.user.name ?? me.user.id);
+  console.log(
+    `active org: ${active ? `${active.slug} (${active.id})` : "\u2014"}${me.organizations.length > 1 ? "  \u2014 change with `compute org use <slug>`" : ""}`
+  );
+}
+var org = program.command("org").description("Manage the active organization");
+org.command("list").description("List your organizations").option("--json", "print machine-readable JSON").action(async (opts) => {
+  const { listOrganizations, getMe } = await import("@benchsdk/cli");
+  const auth = await benchAuth();
+  const [organizations, me] = await Promise.all([listOrganizations(auth), getMe(auth)]);
+  if (opts.json) {
+    console.log(JSON.stringify(organizations, null, 2));
+    return;
+  }
+  for (const o of organizations) {
+    const marker = o.id === me.activeOrganizationId ? pc4.green("*") : " ";
+    console.log(`${marker} ${pc4.cyan(o.slug)}  ${o.name ?? ""}  ${pc4.dim(o.id)}`);
+  }
+});
+org.command("use <slug>").description("Set the active organization (persisted to the stored login)").action(async (slug) => {
+  const { loadCredentials, saveCredentials, createApiClient, setActiveOrganization } = await import("@benchsdk/cli");
+  const credentials = await loadCredentials() ?? {};
+  const { auth } = await createApiClient({ baseUrl: envBaseUrl() });
+  const result = await setActiveOrganization(auth, slug);
+  if (!result.organization) {
+    throw new Error(`Could not set active organization to ${slug}`);
+  }
+  await saveCredentials({
+    ...credentials,
+    baseUrl: auth.baseUrl,
+    // An API-key login must not be rewritten as an OAuth one — keep its
+    // key and kind, and only stamp token fields when this auth actually
+    // is a token session.
+    ...auth.token ? {
+      token: auth.token,
+      refreshToken: auth.refreshToken,
+      tokenExpiresAt: auth.tokenExpiresAt,
+      refreshExpiresAt: auth.refreshExpiresAt,
+      kind: "oauth"
+    } : {},
+    orgSlug: result.organization.slug,
+    orgId: result.organization.id
+  });
+  console.log(`Active organization set to ${result.organization.slug} (${result.organization.id})`);
+});
+org.command("current").description("Show the current user and active organization").action(printWhoami);
+program.command("whoami").description("Show the current user and active organization").action(printWhoami);
 registerActionsCommands(program);
 registerMarketCommands(program);
 registerSandboxesCommands(program);