@erdoai/cli 0.30.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() {
@@ -203,6 +225,16 @@ var ErdoClient = class {
   listOrganizations() {
     return this.request("GET", "/v1/organizations");
   }
+  // --- API tokens (user credentials; default_org is only the header-absent fallback) ---
+  createToken(input) {
+    return this.request("POST", "/v1/tokens", input);
+  }
+  listTokens() {
+    return this.request("GET", "/v1/tokens");
+  }
+  revokeToken(id) {
+    return this.request("DELETE", `/v1/tokens/${encodeURIComponent(id)}`);
+  }
   getAutonomyMode() {
     return this.request("GET", "/v1/autonomy-mode");
   }
@@ -1166,6 +1198,55 @@ org.command("autonomy [mode]").description("Show or set the org's engine-autonom
     fail(e);
   }
 });
+var tokenCmd = program.command("token").description("Manage your API tokens (account-level credentials)");
+tokenCmd.command("create").description("Mint a new API token; the secret is printed ONCE").requiredOption("--name <name>", "a label for the token").option("--expires-days <n>", "days until expiry (default: 30)", (v) => parseInt(v, 10)).option("--org <idOrSlug>", "the token's default org (defaults to your active org; must be one you belong to)").action(async (opts) => {
+  try {
+    const res = await new ErdoClient().createToken({
+      name: opts.name,
+      expires_in_days: opts.expiresDays ?? 30,
+      organization_id: opts.org
+    });
+    process.stderr.write(
+      "Store this token now \u2014 it is shown only once and cannot be retrieved again.\n"
+    );
+    console.log(res.token);
+    process.stderr.write(
+      `
+id: ${res.id}
+hint: ${res.hint}
+expires: ${res.expires_at}
+default org: ${res.default_org ? `${res.default_org.name} (${res.default_org.id})` : "(none)"}
+This token acts as you in any org you belong to; pass --org on a command to target another.
+`
+    );
+  } catch (e) {
+    fail(e);
+  }
+});
+tokenCmd.command("list").description("List your API tokens (never shows the secret)").action(async () => {
+  try {
+    const { tokens } = await new ErdoClient().listTokens();
+    if (tokens.length === 0) {
+      console.log("No API tokens. Create one with: erdo token create --name <name>");
+      return;
+    }
+    for (const t of tokens) {
+      const org2 = t.default_org ? t.default_org.name || t.default_org.id : "-";
+      const used = t.last_used_at ?? "never";
+      console.log(`${t.id}	${t.name || "-"}	${t.hint}	default-org:${org2}	expires:${t.expires_at}	used:${used}`);
+    }
+  } catch (e) {
+    fail(e);
+  }
+});
+tokenCmd.command("revoke <id>").description("Revoke an API token by id").action(async (id) => {
+  try {
+    await new ErdoClient().revokeToken(id);
+    console.log(`revoked: ${id}`);
+  } catch (e) {
+    fail(e);
+  }
+});
 var evalCmd = program.command("eval").description("Run and manage evals");
 evalCmd.command("suites").description("List eval suites in the active org (+ global)").action(async () => {
   try {
@@ -1766,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;
@@ -2007,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) {
@@ -2387,11 +2482,11 @@ analytics.command("query <hogql>").description("Run a read-only HogQL query agai
     fail(e);
   }
 });
-var OPERATORS = ["equals", "not_equals", "greater_than", "less_than", "contains", "between"];
+var OPERATORS = ["equals", "not_equals", "greater_than", "less_than", "contains", "not_contains", "between"];
 function parseCondition(s) {
   const m = s.trim().match(/^(\S+)\s+(\S+)\s+([\s\S]+)$/);
   if (!m) {
-    fail(new Error(`invalid --where ${JSON.stringify(s)}; expected '<column> <operator> <value>', e.g. 'email contains @example.com'`));
+    fail(new Error(`invalid --where ${JSON.stringify(s)}; expected '<column> <operator> <value>', e.g. 'email not_contains @example.com'`));
   }
   const [, column, operator, value] = m;
   if (!OPERATORS.includes(operator)) {
@@ -2486,7 +2581,7 @@ pipelinesCmd.command("get <slug>").description("Show one event pipeline \u2014 s
 });
 filterCmd.command("add <slug>").description("Add a filter to a dataset (default-on unless --no-default)").requiredOption(
   "--where <condition>",
-  "a '<column> <operator> <value>' condition (repeatable, AND-combined), e.g. --where 'email contains @example.com'. Operators: " + OPERATORS.join(", ") + " (for 'between' use 'col between 10,100')",
+  "a '<column> <operator> <value>' condition (repeatable, AND-combined). A filter KEEPS matching rows, so exclude by matching what you want to keep: --where 'email not_contains @example.com' (label 'Exclude test submissions') hides the test rows; --where 'email contains @acme.com' would keep ONLY @acme.com rows. Operators: " + OPERATORS.join(", ") + " (for 'between' use 'col between 10,100')",
   collect,
   []
 ).option("--name <name>", "optional human-readable label, e.g. 'Exclude test submissions'").option(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@erdoai/cli",
-  "version": "0.30.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"