@openwop/cli 1.2.1 → 1.2.3

package/dist/cli.js

@@ -578,7 +578,7 @@ function errText(err) {
 // package.json
 var package_default = {
   name: "@openwop/cli",
-  version: "1.2.1",
+  version: "1.2.3",
   description: "OpenWOP CLI for operating the workflow-engine demo app and OpenWOP-compatible hosts.",
   license: "Apache-2.0",
   type: "module",
@@ -1265,9 +1265,9 @@ function streamBaseFrom(extensions, baseUrl) {
       continue;
     }
     if (url.username !== "" || url.password !== "" || url.search !== "" || url.hash !== "") continue;
-    const secure = url.protocol === "https:" && (base16.protocol === "https:" || isLoopback(base16));
-    const localDev = url.protocol === "http:" && isLoopback(url) && isLoopback(base16);
-    if (!secure && !localDev) continue;
+    if (isLoopback(base16)) {
+      if (!isLoopback(url)) continue;
+    } else if (url.protocol !== "https:" || base16.protocol !== "https:") continue;
     return raw.replace(/\/+$/, "");
   }
   return void 0;
@@ -2004,7 +2004,7 @@ function formatCheckTable(checks) {
 
 // src/cli/routeKit.ts
 var errText2 = (err) => err instanceof Error ? err.message : String(err);
-var DEFAULT_MESSAGES = {
+var MSG = {
   required: (flag, usage6) => `${usage6}
 ${flag} is required.`,
   refusal: (words, positionals) => `Refusing to ${words.join(" ")} ${positionals.join(" ")} without --yes.`.replace(/\s+/g, " ").trim(),
@@ -2083,14 +2083,14 @@ function setPath(target, key, value) {
   }
   node[parts[parts.length - 1]] = value;
 }
-function coerce(f, raw, cmd, msg) {
+function coerce(f, raw) {
   const t = f.type ?? "string";
   if (t === "boolean") return raw;
   if (t === "bool") {
     const s2 = String(raw);
     if (s2 === "true" || s2 === "yes" || s2 === "1") return true;
     if (s2 === "false" || s2 === "no" || s2 === "0") return false;
-    throw new CliError(msg.invalidBool(f.flag, s2), 2);
+    throw new CliError(MSG.invalidBool(f.flag, s2), 2);
   }
   if (t === "list") return Array.isArray(raw) ? raw.map(String) : [String(raw)];
   if (t === "map") {
@@ -2107,7 +2107,7 @@ function coerce(f, raw, cmd, msg) {
   const s = String(raw);
   if (t === "number") {
     const n = Number(s);
-    if (!Number.isFinite(n) || cmd.strictNumbers && s.trim() === "") throw new CliError(msg.invalidNumber(f.flag, s), 2);
+    if (s.trim() === "" || !Number.isFinite(n)) throw new CliError(MSG.invalidNumber(f.flag, s), 2);
     return n;
   }
   if (t === "json-file") {
@@ -2115,7 +2115,7 @@ function coerce(f, raw, cmd, msg) {
     try {
       text = readFileSync4(s, "utf8");
     } catch (err) {
-      throw new CliError(msg.unreadable(f.flag, s, err), 2);
+      throw new CliError(MSG.unreadable(f.flag, s, err), 2);
     }
     try {
       return JSON.parse(text);
@@ -2127,14 +2127,14 @@ function coerce(f, raw, cmd, msg) {
     try {
       return readFileSync4(s).toString("base64");
     } catch (err) {
-      throw new CliError(msg.unreadable(f.flag, s, err), 2);
+      throw new CliError(MSG.unreadable(f.flag, s, err), 2);
     }
   }
   if (t === "file") {
     try {
       return readFileSync4(s, "utf8").replace(/\r?\n$/, "");
     } catch (err) {
-      throw new CliError(msg.unreadable(f.flag, s, err), 2);
+      throw new CliError(MSG.unreadable(f.flag, s, err), 2);
     }
   }
   if (t === "csv") return s.split(",").map((x) => x.trim()).filter(Boolean);
@@ -2142,19 +2142,19 @@ function coerce(f, raw, cmd, msg) {
     try {
       return JSON.parse(s);
     } catch {
-      throw new CliError(msg.invalidJson(f.flag, s), 2);
+      throw new CliError(MSG.invalidJson(f.flag), 2);
     }
   }
   return s;
 }
-function readBodyOptions(options, msg) {
+function readBodyOptions(options) {
   let raw;
   if (options.bodyFile !== void 0) {
     if (String(options.bodyFile).trim() === "") throw new CliError("--body-file needs a path (got an empty value).", 2);
     try {
       raw = readFileSync4(String(options.bodyFile), "utf8");
     } catch (err) {
-      throw new CliError(msg.unreadableBody(String(options.bodyFile), err), 2);
+      throw new CliError(MSG.unreadableBody(String(options.bodyFile), err), 2);
     }
   } else if (options.body !== void 0) {
     raw = String(options.body);
@@ -2164,9 +2164,9 @@ function readBodyOptions(options, msg) {
   try {
     parsed = JSON.parse(raw);
   } catch {
-    throw new CliError(msg.invalidBodyJson, 2);
+    throw new CliError(MSG.invalidBodyJson, 2);
   }
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new CliError(msg.bodyNotObject, 2);
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new CliError(MSG.bodyNotObject, 2);
   return parsed;
 }
 function hostError(err) {
@@ -2177,7 +2177,6 @@ function hostError(err) {
   ${hint}` : line, code);
 }
 async function runRoute(ctx, group, cmd, argv) {
-  const msg = { ...DEFAULT_MESSAGES, ...cmd.messages ?? {} };
   const rest = argv.slice(cmd.words.length);
   const fields = [...cmd.query ?? [], ...cmd.body ?? []];
   const bool = [...COMMON_BOOL, ...fields.filter((f) => f.type === "boolean").flatMap((f) => [f.flag, f.flag.replace(/^--/, "--no-")])];
@@ -2190,8 +2189,7 @@ async function runRoute(ctx, group, cmd, argv) {
   const multi = fields.filter(isMulti).map((f) => f.flag);
   const { options, positionals } = parseOptions(rest, { bool, value, multi });
   if (options.help) {
-    if (cmd.usageText !== void 0) write(ctx.io.stdout, cmd.usageText);
-    else writeLine(ctx.io.stdout, `Usage: ${usageLine(group, cmd)}
+    writeLine(ctx.io.stdout, `Usage: ${usageLine(group, cmd)}
 
 ${cmd.summary}
 Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
@@ -2199,12 +2197,12 @@ Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
   }
   const template = templates(cmd).find((p) => positionalNames(cmd, p).length === positionals.length);
   if (!template) {
-    write(ctx.io.stderr, cmd.usageText ?? `Usage: ${usageLine(group, cmd)}
+    write(ctx.io.stderr, `Usage: ${usageLine(group, cmd)}
 `);
     return 2;
   }
   const path = fillPath(cmd, template, positionals, options.org);
-  const requiredError = (f) => new CliError(msg.required(f.flag, cmd.usageText ?? usageLine(group, cmd)), 2);
+  const requiredError = (f) => new CliError(MSG.required(f.flag, usageLine(group, cmd)), 2);
   const optionOf = (f) => {
     const name = f.flag.replace(/^--/, "").replace(/-([a-z])/g, (_, c) => c.toUpperCase());
     if (f.type === "boolean") {
@@ -2222,7 +2220,7 @@ Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
       if (f.required) throw requiredError(f);
       continue;
     }
-    const c = coerce(f, v, cmd, msg);
+    const c = coerce(f, v);
     if (f.type === "csv") qs2.set(f.key, c.join(","));
     else if (Array.isArray(c)) c.forEach((x) => qs2.append(f.key, String(x)));
     else qs2.set(f.key, c !== null && typeof c === "object" ? JSON.stringify(c) : String(c));
@@ -2230,7 +2228,7 @@ Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
   const url = qs2.size ? `${path}${path.includes("?") ? "&" : "?"}${qs2.toString()}` : path;
   const confirm2 = cmd.confirm ?? cmd.method === "DELETE";
   const gate = () => {
-    if (confirm2 && !options.yes) throw new CliError(msg.refusal(cmd.words, positionals), 2);
+    if (confirm2 && !options.yes) throw new CliError(MSG.refusal(cmd.words, positionals), 2);
   };
   if (!cmd.validateFirst) gate();
   const isWrite = cmd.method !== "GET" && cmd.method !== "DELETE";
@@ -2238,10 +2236,10 @@ Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
   let explicit = {};
   const overlay = {};
   if (takesBody) {
-    explicit = readBodyOptions(options, msg);
+    explicit = readBodyOptions(options);
     for (const f of cmd.body ?? []) {
       const v = optionOf(f);
-      if (v !== void 0) setPath(overlay, f.key, coerce(f, v, cmd, msg));
+      if (v !== void 0) setPath(overlay, f.key, coerce(f, v));
       else if (cmd.validateFirst && f.required && getPath(explicit, f.key) === void 0) throw requiredError(f);
     }
   }
@@ -2278,7 +2276,7 @@ Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
       render(ctx, { ...cmd, method: "GET" }, positionals, err.status, err.body);
       return 1;
     }
-    if (err instanceof HttpError && cmd.hostErrors !== false) throw hostError(err);
+    if (err instanceof HttpError) throw hostError(err);
     throw err;
   }
 }
@@ -2289,7 +2287,7 @@ async function send(ctx, cmd, url, init) {
   try {
     return await requestJson(ctx, url, { method: init.method, ...init.body !== void 0 ? { body: init.body } : {}, ...cmd.anonymous ? { auth: false } : {} });
   } catch (err) {
-    if (err instanceof HttpError && cmd.hostErrors !== false) throw hostError(err);
+    if (err instanceof HttpError) throw hostError(err);
     throw err;
   }
 }
@@ -2339,7 +2337,7 @@ function render(ctx, cmd, positionals, status, rawBody) {
       return;
     }
   }
-  if (cmd.method === "GET" || cmd.writeOutput === "json") {
+  if (cmd.method === "GET") {
     writeJson(ctx.io.stdout, body);
     return;
   }
@@ -6311,25 +6309,8 @@ function parseField(spec) {
   const flag = `--${flagOverride ?? key.replace(/[A-Z]/g, (c) => `-${c.toLowerCase()}`).replace(/_/g, "-")}`;
   return { key, flag, type, required };
 }
-function hasOrg(route) {
-  return /:org(?![A-Za-z0-9_])/.test(route);
-}
-function paramsOf(route) {
-  return (route.match(/:[A-Za-z][A-Za-z0-9_]*/g) ?? []).map((p) => p.slice(1)).filter((p) => p !== "org");
-}
 function usageLine2(group, spec) {
-  const parts = [`openwop ${group}`, ...spec.cmd, ...paramsOf(spec.route).map((p) => `<${p}>`)];
-  if (hasOrg(spec.route)) parts.push("--org <orgId>");
-  const fmt = (f) => {
-    const v = f.type === "bool" ? "true|false" : f.type === "json" ? "json" : f.type === "list" ? "a,b" : f.type === "number" ? "n" : f.type === "file" ? "path" : "v";
-    return f.required ? `${f.flag} <${v}>` : `[${f.flag} <${v}>]`;
-  };
-  for (const f of (spec.query ?? []).map(parseField)) parts.push(fmt(f));
-  for (const f of (spec.body ?? []).map(parseField)) parts.push(fmt(f));
-  if (spec.body || spec.rawBody) parts.push("[--body <json> | --body-file <path>]");
-  if (spec.confirm) parts.push("--yes");
-  parts.push("[--json]");
-  return parts.join(" ");
+  return usageLine(group, toRouteCmd(spec));
 }
 function buildGroupHelp(group, intro, specs, footer = "") {
   const lines = ["Usage:"];
@@ -6358,10 +6339,7 @@ function toField(spec) {
   const f = parseField(spec);
   return { flag: f.flag, key: f.key, type: TYPES[f.type] ?? "string", required: f.required };
 }
-function toRouteCmd(group, spec) {
-  const usage6 = `Usage: ${usageLine2(group, spec)}
-  ${spec.method} ${spec.route} \u2014 ${spec.summary}
-`;
+function toRouteCmd(spec) {
   const rmwKey = spec.rmwKey;
   return {
     words: spec.cmd,
@@ -6381,30 +6359,14 @@ function toRouteCmd(group, spec) {
     rawText: true,
     // every spec, as before — `text` only documents the route
     noContent: spec.method === "DELETE" ? "Deleted." : "Done (HTTP {status}).",
-    writeOutput: "json",
-    hostErrors: false,
-    validateFirst: true,
-    strictNumbers: true,
-    usageText: usage6,
-    messages: {
-      required: (flag, usageText) => `${flag} is required.
-${usageText}`,
-      refusal: () => `Refusing to ${spec.summary.charAt(0).toLowerCase()}${spec.summary.slice(1).replace(/\.$/, "")} without --yes.`,
-      invalidNumber: (flag, raw) => `${flag} must be a number, got: ${raw}`,
-      invalidBool: (flag, raw) => `${flag} must be true or false, got: ${raw}`,
-      invalidJson: (flag) => `${flag} must be valid JSON`,
-      unreadable: (flag, path) => `Cannot read ${flag} ${path}`,
-      unreadableBody: (path) => `Cannot read --body-file ${path}`,
-      invalidBodyJson: "--body/--body-file must be valid JSON",
-      bodyNotObject: "--body/--body-file must be a JSON object"
-    }
+    validateFirst: true
   };
 }
 function matchSpec(specs, argv) {
   return matchRoute(specs.map((spec) => ({ words: spec.cmd, spec })), argv)?.spec;
 }
 async function runSpec(ctx, group, spec, argv) {
-  return runRoute(ctx, group, toRouteCmd(group, spec), [...spec.cmd, ...argv]);
+  return runRoute(ctx, group, toRouteCmd(spec), [...spec.cmd, ...argv]);
 }
 async function dispatchSpecs(ctx, group, specs, argv) {
   const spec = matchSpec(specs, argv);
@@ -29521,8 +29483,9 @@ async function runCapabilityFirewall(ctx, argv) {
   try {
     return await runResourceGroup(ctx, "capability-firewall", CAPABILITY_FIREWALL_HELP, CAPABILITY_FIREWALL_SPECS, argv);
   } catch (err) {
-    if (argv[0] === "platform" && err instanceof HttpError && (err.status === 401 || err.status === 403)) {
-      throw new CliError(gateAdvice("superadmin", "The capability-firewall platform baseline"), 4);
+    if (argv[0] === "platform" && err instanceof CliError && err.code === 4) {
+      throw new CliError(`${gateAdvice("superadmin", "The capability-firewall platform baseline")}
+${err.message}`, 4);
     }
     throw err;
   }

package/dist/openwop.js

@@ -579,7 +579,7 @@ function errText(err) {
 // package.json
 var package_default = {
   name: "@openwop/cli",
-  version: "1.2.1",
+  version: "1.2.3",
   description: "OpenWOP CLI for operating the workflow-engine demo app and OpenWOP-compatible hosts.",
   license: "Apache-2.0",
   type: "module",
@@ -1265,9 +1265,9 @@ function streamBaseFrom(extensions, baseUrl) {
       continue;
     }
     if (url.username !== "" || url.password !== "" || url.search !== "" || url.hash !== "") continue;
-    const secure = url.protocol === "https:" && (base16.protocol === "https:" || isLoopback(base16));
-    const localDev = url.protocol === "http:" && isLoopback(url) && isLoopback(base16);
-    if (!secure && !localDev) continue;
+    if (isLoopback(base16)) {
+      if (!isLoopback(url)) continue;
+    } else if (url.protocol !== "https:" || base16.protocol !== "https:") continue;
     return raw.replace(/\/+$/, "");
   }
   return void 0;
@@ -2004,7 +2004,7 @@ function formatCheckTable(checks) {
 
 // src/cli/routeKit.ts
 var errText2 = (err) => err instanceof Error ? err.message : String(err);
-var DEFAULT_MESSAGES = {
+var MSG = {
   required: (flag, usage6) => `${usage6}
 ${flag} is required.`,
   refusal: (words, positionals) => `Refusing to ${words.join(" ")} ${positionals.join(" ")} without --yes.`.replace(/\s+/g, " ").trim(),
@@ -2083,14 +2083,14 @@ function setPath(target, key, value) {
   }
   node[parts[parts.length - 1]] = value;
 }
-function coerce(f, raw, cmd, msg) {
+function coerce(f, raw) {
   const t = f.type ?? "string";
   if (t === "boolean") return raw;
   if (t === "bool") {
     const s2 = String(raw);
     if (s2 === "true" || s2 === "yes" || s2 === "1") return true;
     if (s2 === "false" || s2 === "no" || s2 === "0") return false;
-    throw new CliError(msg.invalidBool(f.flag, s2), 2);
+    throw new CliError(MSG.invalidBool(f.flag, s2), 2);
   }
   if (t === "list") return Array.isArray(raw) ? raw.map(String) : [String(raw)];
   if (t === "map") {
@@ -2107,7 +2107,7 @@ function coerce(f, raw, cmd, msg) {
   const s = String(raw);
   if (t === "number") {
     const n = Number(s);
-    if (!Number.isFinite(n) || cmd.strictNumbers && s.trim() === "") throw new CliError(msg.invalidNumber(f.flag, s), 2);
+    if (s.trim() === "" || !Number.isFinite(n)) throw new CliError(MSG.invalidNumber(f.flag, s), 2);
     return n;
   }
   if (t === "json-file") {
@@ -2115,7 +2115,7 @@ function coerce(f, raw, cmd, msg) {
     try {
       text = readFileSync4(s, "utf8");
     } catch (err) {
-      throw new CliError(msg.unreadable(f.flag, s, err), 2);
+      throw new CliError(MSG.unreadable(f.flag, s, err), 2);
     }
     try {
       return JSON.parse(text);
@@ -2127,14 +2127,14 @@ function coerce(f, raw, cmd, msg) {
     try {
       return readFileSync4(s).toString("base64");
     } catch (err) {
-      throw new CliError(msg.unreadable(f.flag, s, err), 2);
+      throw new CliError(MSG.unreadable(f.flag, s, err), 2);
     }
   }
   if (t === "file") {
     try {
       return readFileSync4(s, "utf8").replace(/\r?\n$/, "");
     } catch (err) {
-      throw new CliError(msg.unreadable(f.flag, s, err), 2);
+      throw new CliError(MSG.unreadable(f.flag, s, err), 2);
     }
   }
   if (t === "csv") return s.split(",").map((x) => x.trim()).filter(Boolean);
@@ -2142,19 +2142,19 @@ function coerce(f, raw, cmd, msg) {
     try {
       return JSON.parse(s);
     } catch {
-      throw new CliError(msg.invalidJson(f.flag, s), 2);
+      throw new CliError(MSG.invalidJson(f.flag), 2);
     }
   }
   return s;
 }
-function readBodyOptions(options, msg) {
+function readBodyOptions(options) {
   let raw;
   if (options.bodyFile !== void 0) {
     if (String(options.bodyFile).trim() === "") throw new CliError("--body-file needs a path (got an empty value).", 2);
     try {
       raw = readFileSync4(String(options.bodyFile), "utf8");
     } catch (err) {
-      throw new CliError(msg.unreadableBody(String(options.bodyFile), err), 2);
+      throw new CliError(MSG.unreadableBody(String(options.bodyFile), err), 2);
     }
   } else if (options.body !== void 0) {
     raw = String(options.body);
@@ -2164,9 +2164,9 @@ function readBodyOptions(options, msg) {
   try {
     parsed = JSON.parse(raw);
   } catch {
-    throw new CliError(msg.invalidBodyJson, 2);
+    throw new CliError(MSG.invalidBodyJson, 2);
   }
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new CliError(msg.bodyNotObject, 2);
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new CliError(MSG.bodyNotObject, 2);
   return parsed;
 }
 function hostError(err) {
@@ -2177,7 +2177,6 @@ function hostError(err) {
   ${hint}` : line, code2);
 }
 async function runRoute(ctx, group, cmd, argv) {
-  const msg = { ...DEFAULT_MESSAGES, ...cmd.messages ?? {} };
   const rest = argv.slice(cmd.words.length);
   const fields = [...cmd.query ?? [], ...cmd.body ?? []];
   const bool = [...COMMON_BOOL, ...fields.filter((f) => f.type === "boolean").flatMap((f) => [f.flag, f.flag.replace(/^--/, "--no-")])];
@@ -2190,8 +2189,7 @@ async function runRoute(ctx, group, cmd, argv) {
   const multi = fields.filter(isMulti).map((f) => f.flag);
   const { options, positionals } = parseOptions(rest, { bool, value, multi });
   if (options.help) {
-    if (cmd.usageText !== void 0) write(ctx.io.stdout, cmd.usageText);
-    else writeLine(ctx.io.stdout, `Usage: ${usageLine(group, cmd)}
+    writeLine(ctx.io.stdout, `Usage: ${usageLine(group, cmd)}
 
 ${cmd.summary}
 Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
@@ -2199,12 +2197,12 @@ Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
   }
   const template = templates(cmd).find((p) => positionalNames(cmd, p).length === positionals.length);
   if (!template) {
-    write(ctx.io.stderr, cmd.usageText ?? `Usage: ${usageLine(group, cmd)}
+    write(ctx.io.stderr, `Usage: ${usageLine(group, cmd)}
 `);
     return 2;
   }
   const path = fillPath(cmd, template, positionals, options.org);
-  const requiredError = (f) => new CliError(msg.required(f.flag, cmd.usageText ?? usageLine(group, cmd)), 2);
+  const requiredError = (f) => new CliError(MSG.required(f.flag, usageLine(group, cmd)), 2);
   const optionOf = (f) => {
     const name = f.flag.replace(/^--/, "").replace(/-([a-z])/g, (_, c) => c.toUpperCase());
     if (f.type === "boolean") {
@@ -2222,7 +2220,7 @@ Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
       if (f.required) throw requiredError(f);
       continue;
     }
-    const c = coerce(f, v, cmd, msg);
+    const c = coerce(f, v);
     if (f.type === "csv") qs2.set(f.key, c.join(","));
     else if (Array.isArray(c)) c.forEach((x) => qs2.append(f.key, String(x)));
     else qs2.set(f.key, c !== null && typeof c === "object" ? JSON.stringify(c) : String(c));
@@ -2230,7 +2228,7 @@ Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
   const url = qs2.size ? `${path}${path.includes("?") ? "&" : "?"}${qs2.toString()}` : path;
   const confirm2 = cmd.confirm ?? cmd.method === "DELETE";
   const gate = () => {
-    if (confirm2 && !options.yes) throw new CliError(msg.refusal(cmd.words, positionals), 2);
+    if (confirm2 && !options.yes) throw new CliError(MSG.refusal(cmd.words, positionals), 2);
   };
   if (!cmd.validateFirst) gate();
   const isWrite = cmd.method !== "GET" && cmd.method !== "DELETE";
@@ -2238,10 +2236,10 @@ Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
   let explicit = {};
   const overlay = {};
   if (takesBody) {
-    explicit = readBodyOptions(options, msg);
+    explicit = readBodyOptions(options);
     for (const f of cmd.body ?? []) {
       const v = optionOf(f);
-      if (v !== void 0) setPath(overlay, f.key, coerce(f, v, cmd, msg));
+      if (v !== void 0) setPath(overlay, f.key, coerce(f, v));
       else if (cmd.validateFirst && f.required && getPath(explicit, f.key) === void 0) throw requiredError(f);
     }
   }
@@ -2278,7 +2276,7 @@ Endpoint: ${cmd.method} ${templates(cmd).join(" | ")}`);
       render(ctx, { ...cmd, method: "GET" }, positionals, err.status, err.body);
       return 1;
     }
-    if (err instanceof HttpError && cmd.hostErrors !== false) throw hostError(err);
+    if (err instanceof HttpError) throw hostError(err);
     throw err;
   }
 }
@@ -2289,7 +2287,7 @@ async function send(ctx, cmd, url, init) {
   try {
     return await requestJson(ctx, url, { method: init.method, ...init.body !== void 0 ? { body: init.body } : {}, ...cmd.anonymous ? { auth: false } : {} });
   } catch (err) {
-    if (err instanceof HttpError && cmd.hostErrors !== false) throw hostError(err);
+    if (err instanceof HttpError) throw hostError(err);
     throw err;
   }
 }
@@ -2339,7 +2337,7 @@ function render(ctx, cmd, positionals, status, rawBody) {
       return;
     }
   }
-  if (cmd.method === "GET" || cmd.writeOutput === "json") {
+  if (cmd.method === "GET") {
     writeJson(ctx.io.stdout, body);
     return;
   }
@@ -6311,25 +6309,8 @@ function parseField(spec) {
   const flag = `--${flagOverride ?? key.replace(/[A-Z]/g, (c) => `-${c.toLowerCase()}`).replace(/_/g, "-")}`;
   return { key, flag, type, required };
 }
-function hasOrg(route) {
-  return /:org(?![A-Za-z0-9_])/.test(route);
-}
-function paramsOf(route) {
-  return (route.match(/:[A-Za-z][A-Za-z0-9_]*/g) ?? []).map((p) => p.slice(1)).filter((p) => p !== "org");
-}
 function usageLine2(group, spec) {
-  const parts = [`openwop ${group}`, ...spec.cmd, ...paramsOf(spec.route).map((p) => `<${p}>`)];
-  if (hasOrg(spec.route)) parts.push("--org <orgId>");
-  const fmt = (f) => {
-    const v = f.type === "bool" ? "true|false" : f.type === "json" ? "json" : f.type === "list" ? "a,b" : f.type === "number" ? "n" : f.type === "file" ? "path" : "v";
-    return f.required ? `${f.flag} <${v}>` : `[${f.flag} <${v}>]`;
-  };
-  for (const f of (spec.query ?? []).map(parseField)) parts.push(fmt(f));
-  for (const f of (spec.body ?? []).map(parseField)) parts.push(fmt(f));
-  if (spec.body || spec.rawBody) parts.push("[--body <json> | --body-file <path>]");
-  if (spec.confirm) parts.push("--yes");
-  parts.push("[--json]");
-  return parts.join(" ");
+  return usageLine(group, toRouteCmd(spec));
 }
 function buildGroupHelp(group, intro, specs, footer = "") {
   const lines = ["Usage:"];
@@ -6358,10 +6339,7 @@ function toField(spec) {
   const f = parseField(spec);
   return { flag: f.flag, key: f.key, type: TYPES[f.type] ?? "string", required: f.required };
 }
-function toRouteCmd(group, spec) {
-  const usage6 = `Usage: ${usageLine2(group, spec)}
-  ${spec.method} ${spec.route} \u2014 ${spec.summary}
-`;
+function toRouteCmd(spec) {
   const rmwKey = spec.rmwKey;
   return {
     words: spec.cmd,
@@ -6381,30 +6359,14 @@ function toRouteCmd(group, spec) {
     rawText: true,
     // every spec, as before — `text` only documents the route
     noContent: spec.method === "DELETE" ? "Deleted." : "Done (HTTP {status}).",
-    writeOutput: "json",
-    hostErrors: false,
-    validateFirst: true,
-    strictNumbers: true,
-    usageText: usage6,
-    messages: {
-      required: (flag, usageText) => `${flag} is required.
-${usageText}`,
-      refusal: () => `Refusing to ${spec.summary.charAt(0).toLowerCase()}${spec.summary.slice(1).replace(/\.$/, "")} without --yes.`,
-      invalidNumber: (flag, raw) => `${flag} must be a number, got: ${raw}`,
-      invalidBool: (flag, raw) => `${flag} must be true or false, got: ${raw}`,
-      invalidJson: (flag) => `${flag} must be valid JSON`,
-      unreadable: (flag, path) => `Cannot read ${flag} ${path}`,
-      unreadableBody: (path) => `Cannot read --body-file ${path}`,
-      invalidBodyJson: "--body/--body-file must be valid JSON",
-      bodyNotObject: "--body/--body-file must be a JSON object"
-    }
+    validateFirst: true
   };
 }
 function matchSpec(specs, argv) {
   return matchRoute(specs.map((spec) => ({ words: spec.cmd, spec })), argv)?.spec;
 }
 async function runSpec(ctx, group, spec, argv) {
-  return runRoute(ctx, group, toRouteCmd(group, spec), [...spec.cmd, ...argv]);
+  return runRoute(ctx, group, toRouteCmd(spec), [...spec.cmd, ...argv]);
 }
 async function dispatchSpecs(ctx, group, specs, argv) {
   const spec = matchSpec(specs, argv);
@@ -29521,8 +29483,9 @@ async function runCapabilityFirewall(ctx, argv) {
   try {
     return await runResourceGroup(ctx, "capability-firewall", CAPABILITY_FIREWALL_HELP, CAPABILITY_FIREWALL_SPECS, argv);
   } catch (err) {
-    if (argv[0] === "platform" && err instanceof HttpError && (err.status === 401 || err.status === 403)) {
-      throw new CliError(gateAdvice("superadmin", "The capability-firewall platform baseline"), 4);
+    if (argv[0] === "platform" && err instanceof CliError && err.code === 4) {
+      throw new CliError(`${gateAdvice("superadmin", "The capability-firewall platform baseline")}
+${err.message}`, 4);
     }
     throw err;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openwop/cli",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "OpenWOP CLI for operating the workflow-engine demo app and OpenWOP-compatible hosts.",
   "license": "Apache-2.0",
   "type": "module",