@erdoai/cli 0.31.0 → 0.32.0

package/dist/index.js

@@ -180,10 +180,13 @@ function looksLikeHTML(text) {
 function fetchMe(token, orgId) {
   return rawRequest(resolveApiUrl(), token, orgId, "GET", "/v1/me");
 }
+var announcedOrg = false;
 var ErdoClient = class {
   baseURL;
   token;
   orgId;
+  orgPinned;
+  orgName;
   constructor(orgOverride) {
     this.baseURL = resolveApiUrl();
     const acct = activeAccount();
@@ -193,8 +196,27 @@ var ErdoClient = class {
     }
     this.token = token;
     this.orgId = resolveOrgId(acct, orgOverride);
+    this.orgPinned = Boolean(orgOverride || process.env.ERDO_ORG);
+    this.orgName = acct?.organizationName;
+  }
+  announceOrgOnce(method) {
+    if (announcedOrg) return;
+    if (method.toUpperCase() === "GET") return;
+    announcedOrg = true;
+    if (this.orgPinned && this.orgId) {
+      process.stderr.write(`org: ${this.orgId} (pinned)
+`);
+    } else if (this.orgId) {
+      process.stderr.write(
+        `org: ${this.orgName ?? this.orgId} (active org \u2014 pass --org to pin)
+`
+      );
+    } else {
+      process.stderr.write("org: token default (no org resolved \u2014 pass --org to pin)\n");
+    }
   }
   request(method, path, body) {
+    this.announceOrgOnce(method);
     return rawRequest(this.baseURL, this.token, this.orgId, method, path, body);
   }
   me() {
@@ -1825,6 +1847,19 @@ evalCmd.command("create <name>").description("Create a suite (in the active org)
 evalCmd.command("run <slug>").description("Run a suite; --watch polls until it completes").option("-w, --watch", "poll until the run finishes and print results").option("-c, --concurrency <n>", "parallel cases", (v) => parseInt(v, 10)).action(async (slug, opts) => {
   try {
     const api = new ErdoClient();
+    const { suite } = await api.getEvalSuite(slug);
+    if (suite.evaluate_artifact && !process.env.ERDO_ORG) {
+      const resolved = resolveOrgId(activeAccount()) ?? "<org>";
+      console.error(
+        [
+          `Refusing to run "${slug}": it builds real artifacts in the resolved org.`,
+          "The active org is machine-global \u2014 a concurrent session can switch it, so this",
+          "run could land in the wrong org. Re-run with the org pinned:",
+          `  erdo --org ${resolved} eval run ${slug}`
+        ].join("\n")
+      );
+      process.exit(1);
+    }
     const { run_id } = await api.runEvalSuite(slug, opts.concurrency);
     console.log(`run_id: ${run_id}`);
     if (!opts.watch) return;
@@ -2066,8 +2101,9 @@ approvalsCmd.command("list").description("List approval requests, optionally fil
       return;
     }
     for (const r of res.requests) {
+      const occ = r.occurrence_count && r.occurrence_count > 1 ? `	\xD7${r.occurrence_count}` : "";
       console.log(
-        `${r.id}	${r.status}	${r.action_key}	${r.action_display}	${r.created_at}`
+        `${r.id}	${r.status}	${r.action_key}	${r.action_display}	${r.created_at}${occ}`
       );
     }
   } catch (e) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@erdoai/cli",
-  "version": "0.31.0",
-  "description": "Erdo CLI \u2014 drive datasets, pages, and evals from the terminal or CI",
+  "version": "0.32.0",
+  "description": "Erdo CLI — drive datasets, pages, and evals from the terminal or CI",
   "type": "module",
   "bin": {
     "erdo": "dist/index.js"