@erdoai/cli 0.31.0 → 0.33.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() {
@@ -288,6 +310,29 @@ var ErdoClient = class {
   createProject(input) {
     return this.request("POST", "/v1/projects", input);
   }
+  // --- pages ---
+  listPages(params) {
+    const q = new URLSearchParams();
+    if (params?.query) q.set("query", params.query);
+    if (params?.createdAfter) q.set("created_after", params.createdAfter);
+    if (params?.createdBefore) q.set("created_before", params.createdBefore);
+    if (params?.limit) q.set("limit", String(params.limit));
+    if (params?.offset) q.set("offset", String(params.offset));
+    const qs = q.toString();
+    return this.request("GET", `/v1/pages${qs ? `?${qs}` : ""}`);
+  }
+  deletePage(id) {
+    return this.request(
+      "DELETE",
+      `/v1/pages/${encodeURIComponent(id)}`
+    );
+  }
+  restorePage(id) {
+    return this.request(
+      "POST",
+      `/v1/pages/restore/${encodeURIComponent(id)}`
+    );
+  }
   // --- workstreams ---
   listWorkstreams(status) {
     const q = new URLSearchParams();
@@ -1825,6 +1870,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 +2124,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) {
@@ -2293,10 +2352,40 @@ pagesCmd.command("validate").description("Validate page content without deployin
     fail(e);
   }
 });
-pagesCmd.command("list").description("List artifacts (pages, charts, ...)").option("-t, --type <type>", "filter by type (e.g. html_page)").option("-l, --limit <n>", "max results", (v) => parseInt(v, 10)).action(async (opts) => {
+pagesCmd.command("list").description("List pages (newest first). With --type, lists any artifact type instead.").option("-t, --type <type>", "list all artifacts of this type (e.g. html) rather than just pages").option("--query <substr>", "case-insensitive title substring filter (pages only)").option("--created-after <iso>", "only pages created at/after this RFC3339 timestamp (pages only)").option("--created-before <iso>", "only pages created at/before this RFC3339 timestamp (pages only)").option("-l, --limit <n>", "max results", (v) => parseInt(v, 10)).option("--offset <n>", "pagination offset", (v) => parseInt(v, 10)).action(
+  async (opts) => {
+    try {
+      if (opts.type) {
+        const { artifacts } = await new ErdoClient().listArtifacts(opts.type, opts.limit);
+        for (const a of artifacts) console.log(`${a.id}	${a.type}	${a.title}`);
+        return;
+      }
+      const { pages } = await new ErdoClient().listPages({
+        query: opts.query,
+        createdAfter: opts.createdAfter,
+        createdBefore: opts.createdBefore,
+        limit: opts.limit,
+        offset: opts.offset
+      });
+      for (const p of pages) {
+        const vis = p.public ? p.public_url || "public" : "private";
+        console.log(`${p.id}	${p.created_at}	${vis}	${p.title}`);
+      }
+    } catch (e) {
+      fail(e);
+    }
+  }
+);
+pagesCmd.command("delete <id>").description("Delete a page (soft delete \u2014 unpublishes it and hides it from listings; restorable)").action(async (id) => {
+  try {
+    print(await new ErdoClient().deletePage(id));
+  } catch (e) {
+    fail(e);
+  }
+});
+pagesCmd.command("restore <id>").description("Restore a previously deleted page (comes back private)").action(async (id) => {
   try {
-    const { artifacts } = await new ErdoClient().listArtifacts(opts.type, opts.limit);
-    for (const a of artifacts) console.log(`${a.id}	${a.type}	${a.title}`);
+    print(await new ErdoClient().restorePage(id));
   } catch (e) {
     fail(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.33.0",
+  "description": "Erdo CLI — drive datasets, pages, and evals from the terminal or CI",
   "type": "module",
   "bin": {
     "erdo": "dist/index.js"