sim 2.0.0-preview.13.1 → 2.0.0-preview.15.1

package/dist/index.js

@@ -2527,6 +2527,18 @@ function resolveProfile(overrides = {}) {
     }
   };
 }
+// src/version.ts
+import { readFileSync as readFileSync2 } from "node:fs";
+function readPackageVersion() {
+  const metadata = JSON.parse(readFileSync2(new URL("../package.json", import.meta.url), "utf8"));
+  if (typeof metadata !== "object" || metadata === null || !("version" in metadata) || typeof metadata.version !== "string") {
+    throw new Error("CLI package metadata is missing a valid version");
+  }
+  return metadata.version;
+}
+var CLI_VERSION = readPackageVersion();
+var USER_AGENT = `sim-cli/${CLI_VERSION} node/${process.versions.node} (${process.platform}; ${process.arch})`;
+
 // src/http/client.ts
 class SimApiError extends Error {
   status;
@@ -2551,7 +2563,10 @@ function buildUrl(endpoint, path, query) {
 }
 var REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308]);
 var MARKUP_PREFIX = /^\s*<(?:!doctype|html|\?xml)/i;
-var WORKSPACE_KEY_REFUSAL = "WORKSPACE_KEY_OPERATION_NOT_PERMITTED";
+var KEY_SCOPE_REFUSALS = new Set([
+  "WORKSPACE_KEY_OPERATION_NOT_PERMITTED",
+  "PRINCIPAL_KIND_NOT_PERMITTED"
+]);
 function toNonJsonError(url, status, contentType, raw) {
   const type = contentType?.split(";")[0]?.trim().toLowerCase();
   const isMarkup = type === "text/html" || type === "application/xhtml+xml" || MARKUP_PREFIX.test(raw);
@@ -2583,13 +2598,14 @@ function toApiError(url, status, contentType, raw) {
 function truncate(value, max) {
   return value.length <= max ? value : `${value.slice(0, max)}…`;
 }
-function namesWorkspaceKeyRefusal(error) {
-  if (error.code === WORKSPACE_KEY_REFUSAL)
+function namesKeyScopeRefusal(error) {
+  if (typeof error.code === "string" && KEY_SCOPE_REFUSALS.has(error.code))
     return true;
   const details = error.details;
   if (!details || typeof details !== "object")
     return false;
-  return details.code === WORKSPACE_KEY_REFUSAL;
+  const code = details.code;
+  return typeof code === "string" && KEY_SCOPE_REFUSALS.has(code);
 }
 function isStrictPrefix(path, other) {
   if (path.length >= other.length)
@@ -2697,6 +2713,7 @@ class SimClient {
         headers: {
           ...apiKey ? { "x-api-key": apiKey } : {},
           accept: "application/json",
+          "user-agent": USER_AGENT,
           ...hasBody ? { "content-type": "application/json" } : {},
           ...options.headers
         },
@@ -2718,7 +2735,7 @@ class SimClient {
       if (response.status === 401) {
         error.message = `${error.message} — run: sim login --profile ${this.profile.name}`;
       }
-      if (namesWorkspaceKeyRefusal(error)) {
+      if (namesKeyScopeRefusal(error)) {
         error.message = `${error.message} — this operation needs a personal API key: sim login --profile ${this.profile.name}`;
       }
       throw error;
@@ -6093,9 +6110,6 @@ function printRecord(format, fields, raw) {
   }
 }
 
-// src/program.ts
-import { readFileSync as readFileSync3 } from "node:fs";
-
 // ../../node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
 var {
@@ -6128,6 +6142,8 @@ function sleep(ms) {
 var PAIRING_ALPHABET = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
 var POLL_INTERVAL_MS = 2000;
 var POLL_TIMEOUT_MS = 15 * 60 * 1000;
+var APPROVAL_PATH = "/cli/auth";
+var POLL_PATH = "/api/cli/auth/poll";
 var RETRYABLE_POLL_STATUSES = new Set([409, 429, 500, 502, 503, 504]);
 function token() {
   return randomBytes(32).toString("base64url");
@@ -6146,16 +6162,14 @@ function createAuthRequest() {
   };
 }
 function buildApprovalUrl(endpoint, auth, scope, workspaceId) {
-  const url = new URL("/cli/auth", endpoint);
-  url.searchParams.set("request", auth.request);
-  url.searchParams.set("challenge", auth.challenge);
-  url.searchParams.set("pairing", auth.pairing);
-  url.searchParams.set("scope", scope);
-  if (workspaceId)
-    url.searchParams.set("workspace", workspaceId);
-  return url.toString();
+  return buildUrl(endpoint, APPROVAL_PATH, {
+    request: auth.request,
+    challenge: auth.challenge,
+    pairing: auth.pairing,
+    scope,
+    workspace: workspaceId
+  });
 }
-var POLL_PATH = "/api/cli/auth/poll";
 function toRedirectError(endpoint, response) {
   const location = response.headers.get("location")?.trim();
   let target = null;
@@ -6180,9 +6194,13 @@ async function pollForKey(endpoint, auth, signal) {
       throw new SimApiError("Login cancelled.", 0);
     let response = null;
     try {
-      response = await fetch(new URL(POLL_PATH, endpoint), {
+      response = await fetch(buildUrl(endpoint, POLL_PATH), {
         method: "POST",
-        headers: { "content-type": "application/json", accept: "application/json" },
+        headers: {
+          "content-type": "application/json",
+          accept: "application/json",
+          "user-agent": USER_AGENT
+        },
         body: JSON.stringify({ request: auth.request, verifier: auth.pollSecret }),
         signal,
         redirect: "manual"
@@ -9589,7 +9607,7 @@ function configureCommand() {
 }
 
 // src/runtime/request.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2, readSync } from "node:fs";
+import { existsSync as existsSync2, readFileSync as readFileSync3, readSync } from "node:fs";
 
 // src/contract/commands.ts
 var TABLE_NAME_HELP = "Identifier: letters, numbers, and underscores; cannot start with a number";
@@ -10465,7 +10483,7 @@ function readArgumentSource(raw, flagName) {
     }
   }
   try {
-    return { text: readFileSync2(path, "utf8"), from: ` (read from ${path})` };
+    return { text: readFileSync3(path, "utf8"), from: ` (read from ${path})` };
   } catch (error) {
     throw new SimApiError(`--${flagName} cannot read ${path}: ${error.message}`, 0);
   }
@@ -12181,18 +12199,11 @@ Examples:
   $ sim workflows import --workflow @wf.json
   $ sim whoami --profile dev
 `;
-function readPackageVersion() {
-  const metadata = JSON.parse(readFileSync3(new URL("../package.json", import.meta.url), "utf8"));
-  if (typeof metadata !== "object" || metadata === null || !("version" in metadata) || typeof metadata.version !== "string") {
-    throw new Error("CLI package metadata is missing a valid version");
-  }
-  return metadata.version;
-}
 function buildProgram(options = {}) {
   const program2 = new Command;
   program2.name("sim").description(PROGRAM_DESCRIPTION);
   if (options.version !== false)
-    program2.version(readPackageVersion());
+    program2.version(CLI_VERSION);
   program2.option("-P, --profile <name>", "Profile to use (env: SIM_PROFILE)").option("--endpoint <url>", "Sim deployment to talk to (env: SIM_ENDPOINT)").option("-w, --workspace <id>", "Workspace to target (env: SIM_WORKSPACE)").addOption(new Option("--output <format>", "Output format for this command").choices([...OUTPUT_FORMATS]));
   program2.addCommand(loginCommand());
   program2.addCommand(logoutCommand());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sim",
-  "version": "2.0.0-preview.13.1",
+  "version": "2.0.0-preview.15.1",
   "description": "Sim CLI - talk to the Sim API from your terminal",
   "type": "module",
   "bin": {