@erdoai/cli 0.4.0 → 0.5.1

package/dist/index.js

@@ -293,26 +293,32 @@ var ErdoClient = class {
   runHeartbeat(id) {
     return this.request("POST", `/v1/heartbeats/${encodeURIComponent(id)}/run`, {});
   }
-  // --- collections ---
-  listCollections() {
-    return this.request("GET", "/v1/collections");
+  // --- kv (named key/value stores, a.k.a. collections) ---
+  listKVStores() {
+    return this.request("GET", "/v1/kv");
   }
-  createCollection(slug) {
-    return this.request("POST", "/v1/collections", { slug });
+  createKVStore(slug) {
+    return this.request("POST", "/v1/kv", { slug });
   }
-  getCollectionItem(slug, key) {
+  getKVItem(slug, key) {
     return this.request(
       "GET",
-      `/v1/collections/${encodeURIComponent(slug)}/items/${encodeURIComponent(key)}`
+      `/v1/kv/${encodeURIComponent(slug)}/items/${encodeURIComponent(key)}`
     );
   }
-  setCollectionItem(slug, key, value) {
+  setKVItem(slug, key, value) {
     return this.request(
       "PUT",
-      `/v1/collections/${encodeURIComponent(slug)}/items/${encodeURIComponent(key)}`,
+      `/v1/kv/${encodeURIComponent(slug)}/items/${encodeURIComponent(key)}`,
       { value }
     );
   }
+  deleteKVItem(slug, key) {
+    return this.request(
+      "DELETE",
+      `/v1/kv/${encodeURIComponent(slug)}/items/${encodeURIComponent(key)}`
+    );
+  }
   // --- agent runs ---
   listAgentRuns(opts) {
     const params = new URLSearchParams();
@@ -438,19 +444,30 @@ async function browserLogin() {
 import { spawnSync } from "child_process";
 var PKG = "@erdoai/cli";
 var MANUAL_HINT = `npm install -g ${PKG}@latest`;
+function parseVersion(v) {
+  const [core, pre = ""] = v.split("-", 2);
+  const nums = core.split(".").map((s) => Number.parseInt(s, 10) || 0);
+  return { nums, pre };
+}
 function isNewer(latest, current) {
-  const a = latest.split(".").map(Number);
-  const b = current.split(".").map(Number);
+  const a = parseVersion(latest);
+  const b = parseVersion(current);
   for (let i = 0; i < 3; i++) {
-    if ((a[i] ?? 0) > (b[i] ?? 0)) return true;
-    if ((a[i] ?? 0) < (b[i] ?? 0)) return false;
-  }
-  return false;
+    const x = a.nums[i] ?? 0;
+    const y = b.nums[i] ?? 0;
+    if (x > y) return true;
+    if (x < y) return false;
+  }
+  if (!a.pre && b.pre) return true;
+  if (a.pre && !b.pre) return false;
+  return a.pre > b.pre;
 }
 async function update(current) {
   let latest;
   try {
-    const res = await fetch(`https://registry.npmjs.org/${PKG}/latest`);
+    const res = await fetch(`https://registry.npmjs.org/${PKG}/latest`, {
+      signal: AbortSignal.timeout(1e4)
+    });
     if (res.ok) latest = (await res.json()).version;
   } catch {
   }
@@ -468,6 +485,10 @@ async function update(current) {
     // npm is npm.cmd on Windows; needs a shell to resolve.
     shell: process.platform === "win32"
   });
+  if (result.error) {
+    console.error(`Update failed: ${result.error.message}. Try manually: ${MANUAL_HINT}`);
+    process.exit(1);
+  }
   if (result.status !== 0) {
     console.error(`Update failed. Try manually: ${MANUAL_HINT}`);
     process.exit(result.status ?? 1);
@@ -945,7 +966,16 @@ function readMaybeFile(v) {
   if (!v) return void 0;
   return v.startsWith("@") ? readFileSync2(v.slice(1), "utf8") : v;
 }
-pagesCmd.command("deploy").description("Deploy a page (HTML/React); --html/--js/--css accept @file").requiredOption("--title <title>", "page title").requiredOption("--html <htmlOr@file>", "HTML (or @path to a file)").option("--js <jsOr@file>", "JS/JSX (or @path)").option("--css <cssOr@file>", "CSS (or @path)").option("--runtime <runtime>", "react-tailwind (default) or none").option("--datasets <csv>", "dataset slugs the page reads").option("--writable-datasets <csv>", "dataset slugs the page may write via erdo.insertRows").option("--collections <csv>", "named collection slugs the page reads").option("--writable-collections <csv>", "named collection slugs the page may write").option("--public", "make the page publicly viewable").action(
+function grantList(v) {
+  if (v === void 0) return void 0;
+  if (v.trim() === "[]") return [];
+  const slugs = v.split(",").map((s) => s.trim()).filter(Boolean);
+  if (slugs.length === 0) {
+    throw new Error(`expected comma-separated slugs, or "[]" to clear \u2014 got ${JSON.stringify(v)}`);
+  }
+  return slugs;
+}
+pagesCmd.command("deploy").description("Deploy a page (HTML/React); --html/--js/--css accept @file").requiredOption("--title <title>", "page title").requiredOption("--html <htmlOr@file>", "HTML (or @path to a file)").option("--js <jsOr@file>", "JS/JSX (or @path)").option("--css <cssOr@file>", "CSS (or @path)").option("--runtime <runtime>", "react-tailwind (default) or none").option("--datasets <csv>", "dataset slugs the page reads").option("--writable-datasets <csv>", "dataset slugs the page may write via erdo.insertRows").option("--kv <csv>", "named KV-store slugs the page reads").option("--writable-kv <csv>", "named KV-store slugs the page may write").option("--public", "make the page publicly viewable").action(
   async (opts) => {
     try {
       const csv = (v) => v ? v.split(",").map((s) => s.trim()) : void 0;
@@ -957,8 +987,8 @@ pagesCmd.command("deploy").description("Deploy a page (HTML/React); --html/--js/
         runtime: opts.runtime,
         dataset_slugs: csv(opts.datasets),
         writable_dataset_slugs: csv(opts.writableDatasets),
-        collection_slugs: csv(opts.collections),
-        writable_collection_slugs: csv(opts.writableCollections),
+        kv_slugs: csv(opts.kv),
+        writable_kv_slugs: csv(opts.writableKv),
         public: !!opts.public
       });
       console.log(`${res.id}	${res.public_url || res.url}`);
@@ -968,6 +998,29 @@ pagesCmd.command("deploy").description("Deploy a page (HTML/React); --html/--js/
     }
   }
 );
+pagesCmd.command("update <id>").description(
+  "Update an existing page by id; provided fields are merged (update just --js to keep html/css). --html/--js/--css accept @file"
+).option("--title <title>", "new title").option("--html <htmlOr@file>", "HTML (or @path to a file)").option("--js <jsOr@file>", "JS/JSX (or @path)").option("--css <cssOr@file>", "CSS (or @path)").option("--datasets <csv>", 'replacement read-dataset slugs ("[]" clears)').option("--writable-datasets <csv>", 'replacement writable-dataset slugs ("[]" clears)').option("--kv <csv>", 'replacement read KV-store slugs ("[]" clears)').option("--writable-kv <csv>", 'replacement writable KV-store slugs ("[]" clears)').option("--public", "make the page publicly viewable").option("--private", "make the page private").action(
+  async (id, opts) => {
+    try {
+      const res = await new ErdoClient().updatePage(id, {
+        title: opts.title,
+        html: readMaybeFile(opts.html),
+        js: readMaybeFile(opts.js),
+        css: readMaybeFile(opts.css),
+        dataset_slugs: grantList(opts.datasets),
+        writable_dataset_slugs: grantList(opts.writableDatasets),
+        kv_slugs: grantList(opts.kv),
+        writable_kv_slugs: grantList(opts.writableKv),
+        public: opts.public ? true : opts.private ? false : void 0
+      });
+      console.log(`${res.id}	${res.public_url || res.url}`);
+      if (res.warning) console.error(`warning: ${res.warning}`);
+    } catch (e) {
+      fail(e);
+    }
+  }
+);
 pagesCmd.command("validate").description("Validate page content without deploying").requiredOption("--html <htmlOr@file>", "HTML (or @path)").option("--js <jsOr@file>", "JS/JSX (or @path)").option("--css <cssOr@file>", "CSS (or @path)").option("--runtime <runtime>", "react-tailwind (default) or none").action(async (opts) => {
   try {
     print(
@@ -1044,29 +1097,29 @@ autoCmd.command("run <id>").description("Trigger an automation now").action(asyn
     fail(e);
   }
 });
-var collCmd = program.command("collections").description("Named key/value collections");
-collCmd.command("list").description("List collections").action(async () => {
+var kvCmd = program.command("kv").description("Named key/value stores");
+kvCmd.command("list").description("List KV stores").action(async () => {
   try {
-    print(await new ErdoClient().listCollections());
+    print(await new ErdoClient().listKVStores());
   } catch (e) {
     fail(e);
   }
 });
-collCmd.command("create <slug>").description("Create a named collection (slug: lowercase letters, digits, hyphens)").action(async (slug) => {
+kvCmd.command("create <slug>").description("Create a named KV store (slug: lowercase letters, digits, hyphens)").action(async (slug) => {
   try {
-    print(await new ErdoClient().createCollection(slug));
+    print(await new ErdoClient().createKVStore(slug));
   } catch (e) {
     fail(e);
   }
 });
-collCmd.command("get <slug> <key>").description("Get a collection item").action(async (slug, key) => {
+kvCmd.command("get <slug> <key>").description("Get a KV item").action(async (slug, key) => {
   try {
-    print(await new ErdoClient().getCollectionItem(slug, key));
+    print(await new ErdoClient().getKVItem(slug, key));
   } catch (e) {
     fail(e);
   }
 });
-collCmd.command("set <slug> <key> <jsonValue>").description("Set a collection item (value is parsed as JSON, else stored as string)").action(async (slug, key, jsonValue) => {
+kvCmd.command("set <slug> <key> <jsonValue>").description("Set a KV item (value is parsed as JSON, else stored as string)").action(async (slug, key, jsonValue) => {
   try {
     let value;
     try {
@@ -1074,7 +1127,14 @@ collCmd.command("set <slug> <key> <jsonValue>").description("Set a collection it
     } catch {
       value = jsonValue;
     }
-    print(await new ErdoClient().setCollectionItem(slug, key, value));
+    print(await new ErdoClient().setKVItem(slug, key, value));
+  } catch (e) {
+    fail(e);
+  }
+});
+kvCmd.command("delete <slug> <key>").description("Delete a KV item").action(async (slug, key) => {
+  try {
+    print(await new ErdoClient().deleteKVItem(slug, key));
   } catch (e) {
     fail(e);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@erdoai/cli",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Erdo CLI — drive datasets, pages, and evals from the terminal or CI",
   "type": "module",
   "bin": {

package/scripts/postinstall.mjs

@@ -1,19 +1,39 @@
 // Friendly getting-started hint, printed once after `npm install -g @erdoai/cli`.
 // Stays quiet in CI and non-interactive installs (and never fails the install).
-import { existsSync } from "node:fs";
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
 
 try {
   // In our own source checkout the package ships `dist` + this script but never
   // `src`, so a sibling `src/` means this is a dev `npm install` — stay quiet.
   const devCheckout = existsSync(new URL("../src", import.meta.url));
 
+  // Print once per machine: a sentinel under the CLI's config dir (same dir as
+  // config.json) suppresses the banner on later installs — notably the global
+  // reinstall `erdo update` performs, which would otherwise re-trigger it.
+  const configDir = join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "erdo");
+  const sentinel = join(configDir, ".welcomed");
+
   const quiet =
     devCheckout ||
+    // Only greet on a global install — a local/devDependency install must not
+    // print the banner or write the sentinel (which would silence the real
+    // `npm install -g` welcome later). npm sets this to "true" for `-g`.
+    process.env.npm_config_global !== "true" ||
     process.env.CI ||
     process.env.ERDO_NO_POSTINSTALL ||
-    !process.stdout.isTTY;
+    !process.stdout.isTTY ||
+    existsSync(sentinel);
 
   if (!quiet) {
+    try {
+      mkdirSync(configDir, { recursive: true });
+      writeFileSync(sentinel, "");
+    } catch {
+      // a read-only home shouldn't suppress the hint or fail the install
+    }
+
     const c = (code, s) => `\x1b[${code}m${s}\x1b[0m`;
     const b = (s) => c("1", s);
     const dim = (s) => c("2", s);