create-op-node 0.10.3 → 0.10.5

package/dist/cli.js

@@ -28,7 +28,10 @@ async function get(token, path, fetchImpl = fetch) {
 function shortError(body) {
   if (typeof body === "object" && body !== null && "errors" in body && Array.isArray(body.errors)) {
     const errs = body.errors;
-    return errs.map((e) => `${e.code ? `CF ${e.code}: ` : ""}${e.message ?? "unknown"}`).join("; ");
+    return errs.map((e) => {
+      const prefix = e.code ? `CF ${e.code}: ` : "";
+      return `${prefix}${e.message ?? "unknown"}`;
+    }).join("; ");
   }
   return "no error message returned";
 }
@@ -484,7 +487,7 @@ function generatePgsodiumRootKey() {
 }
 function base64url(input) {
   const buf = typeof input === "string" ? Buffer.from(input) : input;
-  return buf.toString("base64").replace(/=+$/, "").replace(/\+/g, "-").replace(/\//g, "_");
+  return buf.toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
 }
 function generatePostgresPassword() {
   return base64url(randomBytes(32));
@@ -710,12 +713,13 @@ var initCommand = new Command("init").description(
   const kcNote = keychain.available ? `\u2713 macOS Keychain available \u2014 pgsodium key + Tunnel token will be saved to your login keychain.
 ` + pc2.dim("Note: items don't sync to iCloud Keychain via the security CLI.\n") + pc2.dim("On the Studio, bootstrap will read locally and prompt you to paste if missing.") : `\u26A0 ${keychain.reason ?? "Keychain unavailable"}. Secrets will be printed for manual stash.`;
   p3.note(kcNote, "Secret store");
+  const orgWriteAccess = pc2.dim(`required for ${owner}`);
   p3.note(
     opts.localOnly ? [
       `Region label:        ${pc2.cyan(region)}`,
       `New node repo:       ${pc2.cyan(newRepoFull)}`,
       `Template:            ${pc2.dim(opts.template ?? "OpusPopuli/opuspopuli-node")}`,
-      `GH org write access: ${pc2.dim(`required for ${owner}`)}`,
+      `GH org write access: ${orgWriteAccess}`,
       ``,
       `Will create the repo from template (private, no Cloudflare),`,
       `and store a fresh pgsodium key in Keychain. That's it \u2014 no PR,`,
@@ -727,7 +731,7 @@ var initCommand = new Command("init").description(
       `New node repo:       ${pc2.cyan(newRepoFull)}`,
       `Template:            ${pc2.dim(opts.template ?? "OpusPopuli/opuspopuli-node")}`,
       `TFC organization:    ${pc2.cyan(publicConfig?.tfOrg ?? "")}`,
-      `GH org write access: ${pc2.dim(`required for ${owner}`)}`,
+      `GH org write access: ${orgWriteAccess}`,
       ``,
       `Will create the repo, seed 5 secrets, write prod.tfvars on a branch,`,
       `open a PR, generate a fresh pgsodium key, and (after you merge) wait`,
@@ -1010,7 +1014,10 @@ async function collectPublicConfig(opts) {
     await p3.text({
       message: "Domain registered in Cloudflare?",
       placeholder: "example.org",
-      validate: (v) => !v ? "Required" : v.includes(".") ? void 0 : "Missing a TLD?"
+      validate: (v) => {
+        if (!v) return "Required";
+        return v.includes(".") ? void 0 : "Missing a TLD?";
+      }
     })
   );
   const cfToken = await collectSecret(
@@ -1054,9 +1061,10 @@ async function collectPublicConfig(opts) {
     p3.cancel("Fix the token / org, then re-run.");
     process.exit(1);
   }
+  const asUser = tfProbe.userName ? ` (as ${tfProbe.userName})` : "";
   tfSpin.stop(
     pc2.green(
-      `\u2713 TFC token valid${tfProbe.userName ? ` (as ${tfProbe.userName})` : ""}, org "${tfOrg}" reachable.`
+      `\u2713 TFC token valid${asUser}, org "${tfOrg}" reachable.`
     )
   );
   return { domain, cfToken, cfAccount, cfZone, tfToken, tfOrg };
@@ -2297,7 +2305,10 @@ var bootstrapCommand = new Command("bootstrap").description(
       validate: (v) => URL_SAFE_PASSWORD_RE.test(v) ? void 0 : "must be base64url chars only (no + / =)"
     });
   }
-  const promptServiceUrl = nodeType === "region-with-prompts" ? "http://opuspopuli-prompts:3210" : opts.promptServiceUrl ?? "https://prompts.opuspopuli.org";
+  const promptServiceUrl = nodeType === "region-with-prompts" ? (
+    // eslint-disable-next-line sonarjs/no-clear-text-protocols -- in-network (docker) prompt-service URL is legitimately plaintext http; no TLS on the internal bridge
+    "http://opuspopuli-prompts:3210"
+  ) : opts.promptServiceUrl ?? "https://prompts.opuspopuli.org";
   if (!SAFE_URL_RE.test(promptServiceUrl)) {
     p3.cancel(
       `--prompt-service-url ${JSON.stringify(promptServiceUrl)} contains characters outside the allowed URL set`
@@ -2314,7 +2325,10 @@ var bootstrapCommand = new Command("bootstrap").description(
       await p3.text({
         message: "Public-facing Supabase URL (what browsers + microservices use to reach kong)?",
         placeholder: "https://supabase.civicfeed.tx",
-        validate: (v) => !v ? "required" : SAFE_URL_RE.test(v) ? void 0 : "contains characters outside the allowed URL set"
+        validate: (v) => {
+          if (!v) return "required";
+          return SAFE_URL_RE.test(v) ? void 0 : "contains characters outside the allowed URL set";
+        }
       })
     );
   }
@@ -2587,8 +2601,8 @@ async function selectLlmModel(opts) {
   );
 }
 function estimatedPullTime(model) {
-  if (/\d+x\d+b/i.test(model)) return "~60+ min for frontier MoE";
-  const match = /(\d+)b\b/i.exec(model);
+  if (/\d{1,3}x\d{1,3}b/i.test(model)) return "~60+ min for frontier MoE";
+  const match = /(\d{1,4})b\b/i.exec(model);
   if (!match) return "time depends on model size";
   const size = Number.parseInt(match[1], 10);
   if (size <= 13) return "~3\u20135 min for \u2264 13B-class";
@@ -2940,11 +2954,19 @@ var resetCommand = new Command("reset").description(
       ...opts.envFile ? { envFile: opts.envFile } : {}
     });
   }
+  let runningContainersLabel;
+  if (runningContainers === null) {
+    runningContainersLabel = pc2.dim("unknown");
+  } else if (runningContainers.length === 0) {
+    runningContainersLabel = pc2.dim("none");
+  } else {
+    runningContainersLabel = pc2.cyan(`${runningContainers.length} listed by compose ps`);
+  }
   p3.note(
     [
       `Region:                ${pc2.cyan(region)}`,
       `Repo path:             ${repoPath ? pc2.cyan(repoPath) : pc2.dim(`not used (${stackSkipReason ?? "no repo path resolved"})`)}`,
-      `Running containers:    ${runningContainers === null ? pc2.dim("unknown") : runningContainers.length === 0 ? pc2.dim("none") : pc2.cyan(`${runningContainers.length} listed by compose ps`)}`,
+      `Running containers:    ${runningContainersLabel}`,
       `LaunchAgent plist:     ${plistExists ? pc2.cyan(launchAgentPaths.plistFile) : pc2.dim("not present")}`,
       `pgsodium key file:     ${keyFileExists ? pc2.cyan(launchAgentPaths.keyFile) : pc2.dim("not present")}`,
       `Registry to log out:   ${pc2.cyan(opts.registry ?? GHCR_REGISTRY)}`,
@@ -3400,7 +3422,7 @@ var verifyCommand = new Command("verify").description(
   );
   activeSpin?.stop("Done.");
   const visible = opts.showSkipped ?? false ? report.phases : report.phases.filter((ph) => ph.status !== "skipped");
-  const lines = visible.map((ph, i) => {
+  const lines = visible.map((ph) => {
     const idx = report.phases.indexOf(ph) + 1;
     return `${phaseIcon2(ph)} [${idx}/${totalPhases}] ${ph.name}: ${pc2.dim(ph.detail)}`;
   });
@@ -3411,9 +3433,11 @@ var verifyCommand = new Command("verify").description(
   p3.note(lines.join("\n"), "Summary");
   const summary = summarize(report);
   if (summary.ok) {
-    p3.outro(
-      summary.warned === 0 ? pc2.green("All checks passed.") : pc2.yellow(`Passed with ${summary.warned} warning${summary.warned === 1 ? "" : "s"}.`)
-    );
+    if (summary.warned === 0) {
+      p3.outro(pc2.green("All checks passed."));
+    } else {
+      p3.outro(pc2.yellow(`Passed with ${summary.warned} warning${summary.warned === 1 ? "" : "s"}.`));
+    }
   } else {
     p3.outro(pc2.red(`${summary.failed} check${summary.failed === 1 ? "" : "s"} failed.`));
     process.exit(1);
@@ -3431,9 +3455,21 @@ function phaseIcon2(ph) {
       return pc2.red("\u2717");
   }
 }
+function phaseColor(status) {
+  switch (status) {
+    case "ok":
+      return pc2.green;
+    case "warn":
+      return pc2.yellow;
+    case "skipped":
+      return pc2.dim;
+    case "fail":
+      return pc2.red;
+  }
+}
 function formatPhaseLine(prefix, ph) {
   const icon = phaseIcon2(ph);
-  const colorize = ph.status === "ok" ? pc2.green : ph.status === "warn" ? pc2.yellow : ph.status === "skipped" ? pc2.dim : pc2.red;
+  const colorize = phaseColor(ph.status);
   return colorize(`${icon} ${prefix}: ${ph.detail}`);
 }
 
@@ -4096,7 +4132,7 @@ var SOURCE_TYPES = [
 var SLUG_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 var STATE_CODE_RE = /^[A-Z]{2}$/;
 function slugify(input) {
-  return input.normalize("NFKD").replace(/[̀-ͯ]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+  return input.normalize("NFKD").replace(/[̀-ͯ]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
 }
 function isValidSlug(v) {
   return SLUG_RE.test(v);
@@ -4318,7 +4354,11 @@ var regionCommand = new Command("region").description(
     await p3.text({
       message: level === "county" ? "County FIPS (5 digits)?" : "State FIPS (2 digits)?",
       placeholder: level === "county" ? "06001" : "06",
-      validate: (v) => isValidFips(v ?? "", level) ? void 0 : `Expected ${level === "county" ? "5" : "2"} digits`
+      validate: (v) => {
+        if (isValidFips(v ?? "", level)) return void 0;
+        const expectedDigits = level === "county" ? "5" : "2";
+        return `Expected ${expectedDigits} digits`;
+      }
     })
   );
   if (!isValidFips(fipsCode, level)) {
@@ -4452,7 +4492,7 @@ async function looksLikeRegionsRepo(dir) {
 }
 
 // src/cli.ts
-var VERSION = "0.10.3";
+var VERSION = "0.10.5";
 var program = new Command();
 program.name("create-op-node").description(
   "Interactive bootstrap for an Opus Populi federation node.\nCloudflare infrastructure \u2192 Mac Studio \u2192 live public API."