@openwop/cli 1.4.0 → 1.5.0

package/README.md

@@ -134,7 +134,7 @@ openwop packs search ads        # browse the signed pack registry
 
 The `onboard` wizard walks you through:
 
-1. **Host URL** — `https://app.openwop.dev/api` (shared demo), `http://localhost:8080` (local), or a custom URL.
+1. **Host URL** — `https://api.openwop.dev` (shared demo; `https://app.openwop.dev/api` also works), `http://localhost:8080` (local), or a custom URL.
 2. **AI provider** — `anthropic`, `openai`, `google`, or `minimax` (matches what the demo backend dispatches to).
 3. **API key** — auto-detects `ANTHROPIC_API_KEY` / `OPENAI_API_KEY` / `GOOGLE_API_KEY` / `MINIMAX_API_KEY`, or hidden-input via raw-mode stdin. The key is POSTed to `/v1/host/openwop-app/byok/secrets` on the configured host. **The key is never written to your local config file** — only a credential ref pointer is stored.
 4. **Model** — provider-specific recommended defaults plus a custom option.

package/dist/cli.js

@@ -578,7 +578,7 @@ function errText(err) {
 // package.json
 var package_default = {
   name: "@openwop/cli",
-  version: "1.4.0",
+  version: "1.5.0",
   description: "OpenWOP CLI for operating the workflow-engine demo app and OpenWOP-compatible hosts.",
   license: "Apache-2.0",
   type: "module",
@@ -667,7 +667,10 @@ var PROVIDER_CATALOG = {
   }
 };
 var HOST_PRESETS = [
-  { key: "shared", label: "Shared demo at https://app.openwop.dev/api (recommended for trying things out)", url: "https://app.openwop.dev/api" },
+  // openwop-app ADR 0827: the protocol origin, served straight from Cloud Run with
+  // no CDN in front (`https://app.openwop.dev/api` still works; its edge drops
+  // conditional requests). `openwop login` opens the host-named web page.
+  { key: "shared", label: "Shared demo at https://api.openwop.dev (recommended for trying things out)", url: "https://api.openwop.dev" },
   { key: "local", label: "Local demo at http://localhost:8080 (run `openwop demo start` to launch)", url: "http://localhost:8080" }
 ];
 
@@ -4526,7 +4529,7 @@ async function runCatalogPacks(ctx, argv = []) {
     write(ctx.io.stdout, CATALOG_HELP);
     return 0;
   }
-  const res = await requestJson(ctx, "/v1/packs", { auth: false });
+  const res = await catalogRead(ctx, "", { auth: false });
   if (ctx.json) {
     writeJson(ctx.io.stdout, res.body);
     return 0;
@@ -4535,6 +4538,14 @@ async function runCatalogPacks(ctx, argv = []) {
   writeLine(ctx.io.stdout, formatTable(rows, ["name", "nodes"]));
   return 0;
 }
+async function catalogRead(ctx, rest, options = {}) {
+  try {
+    return await requestJson(ctx, `/v1/host/openwop-app/packs${rest}`, options);
+  } catch (err) {
+    if (err instanceof HttpError && err.status === 404) return requestJson(ctx, `/v1/packs${rest}`, options);
+    throw err;
+  }
+}
 async function runCatalogPacksVerb(ctx, verb, argv) {
   const { options, positionals } = parseOptions(argv, { bool: ["--help"], value: ["--out"] });
   if (options.help) {
@@ -4543,7 +4554,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
   }
   if (verb === "search") {
     const q = positionals[0] ?? "";
-    const res2 = await requestJson(ctx, `/v1/packs/-/search${q ? `?q=${encodeURIComponent(q)}` : ""}`);
+    const res2 = await catalogRead(ctx, `/-/search${q ? `?q=${encodeURIComponent(q)}` : ""}`);
     if (ctx.json) {
       writeJson(ctx.io.stdout, res2.body);
       return 0;
@@ -4559,7 +4570,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
   }
   if (verb === "get") {
     if (positionals.length !== 1) throw new CliError("Usage: openwop catalog packs get <packName> [--json]", 2);
-    const res2 = await requestJson(ctx, `/v1/packs/${encodeURIComponent(positionals[0])}`);
+    const res2 = await catalogRead(ctx, `/${encodeURIComponent(positionals[0])}`);
     if (ctx.json) {
       writeJson(ctx.io.stdout, res2.body);
       return 0;
@@ -4570,7 +4581,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
     for (const n of nodes) writeLine(ctx.io.stdout, `  ${n}`);
     return 0;
   }
-  const res = await requestJson(ctx, "/v1/packs/export");
+  const res = await catalogRead(ctx, "/export");
   if (options.out) {
     writeFileSync4(String(options.out), `${JSON.stringify(res.body, null, 2)}
 `);
@@ -14917,13 +14928,21 @@ Approve a code ONLY if you just ran \`openwop login\` yourself.
 Exit codes: 0 signed in / signed out \xB7 1 denied, expired or not available on this host \xB7 2 usage.
 
 Examples:
-  export OPENWOP_BASE_URL=https://app.openwop.dev/api
+  export OPENWOP_BASE_URL=https://api.openwop.dev
   openwop login
   openwop login --label "work laptop"
   openwop logout
 `;
 var sleep2 = (ms2) => new Promise((r) => setTimeout(r, ms2));
-function approvalUrl(baseUrl, path) {
+function approvalUrl(baseUrl, path, uri) {
+  if (typeof uri === "string") {
+    try {
+      const u = new URL(uri);
+      const loopback = u.hostname === "localhost" || u.hostname === "127.0.0.1" || u.hostname === "[::1]";
+      if (u.protocol === "https:" || u.protocol === "http:" && loopback) return u.toString();
+    } catch {
+    }
+  }
   const p = typeof path === "string" && path.startsWith("/") ? path : "/access?tab=api-keys";
   try {
     return `${new URL(baseUrl).origin}${p}`;
@@ -14961,7 +14980,7 @@ async function runLogin(ctx, argv) {
   const userCode = started?.userCode;
   if (typeof deviceCode !== "string" || typeof userCode !== "string") throw notAvailable(ctx);
   writeLine(ctx.io.stderr, "");
-  writeLine(ctx.io.stderr, `  1. Open   ${approvalUrl(ctx.baseUrl, started.verificationPath)}`);
+  writeLine(ctx.io.stderr, `  1. Open   ${approvalUrl(ctx.baseUrl, started.verificationPath, started.verificationUri)}`);
   writeLine(ctx.io.stderr, `  2. Enter  ${userCode}   under "Sign in the OpenWOP CLI", and approve.`);
   writeLine(ctx.io.stderr, "");
   writeLine(ctx.io.stderr, "Waiting for approval\u2026");

package/dist/openwop.js

@@ -579,7 +579,7 @@ function errText(err) {
 // package.json
 var package_default = {
   name: "@openwop/cli",
-  version: "1.4.0",
+  version: "1.5.0",
   description: "OpenWOP CLI for operating the workflow-engine demo app and OpenWOP-compatible hosts.",
   license: "Apache-2.0",
   type: "module",
@@ -668,7 +668,10 @@ var PROVIDER_CATALOG = {
   }
 };
 var HOST_PRESETS = [
-  { key: "shared", label: "Shared demo at https://app.openwop.dev/api (recommended for trying things out)", url: "https://app.openwop.dev/api" },
+  // openwop-app ADR 0827: the protocol origin, served straight from Cloud Run with
+  // no CDN in front (`https://app.openwop.dev/api` still works; its edge drops
+  // conditional requests). `openwop login` opens the host-named web page.
+  { key: "shared", label: "Shared demo at https://api.openwop.dev (recommended for trying things out)", url: "https://api.openwop.dev" },
   { key: "local", label: "Local demo at http://localhost:8080 (run `openwop demo start` to launch)", url: "http://localhost:8080" }
 ];
 
@@ -4526,7 +4529,7 @@ async function runCatalogPacks(ctx, argv = []) {
     write(ctx.io.stdout, CATALOG_HELP);
     return 0;
   }
-  const res = await requestJson(ctx, "/v1/packs", { auth: false });
+  const res = await catalogRead(ctx, "", { auth: false });
   if (ctx.json) {
     writeJson(ctx.io.stdout, res.body);
     return 0;
@@ -4535,6 +4538,14 @@ async function runCatalogPacks(ctx, argv = []) {
   writeLine(ctx.io.stdout, formatTable(rows, ["name", "nodes"]));
   return 0;
 }
+async function catalogRead(ctx, rest, options = {}) {
+  try {
+    return await requestJson(ctx, `/v1/host/openwop-app/packs${rest}`, options);
+  } catch (err) {
+    if (err instanceof HttpError && err.status === 404) return requestJson(ctx, `/v1/packs${rest}`, options);
+    throw err;
+  }
+}
 async function runCatalogPacksVerb(ctx, verb, argv) {
   const { options, positionals } = parseOptions(argv, { bool: ["--help"], value: ["--out"] });
   if (options.help) {
@@ -4543,7 +4554,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
   }
   if (verb === "search") {
     const q = positionals[0] ?? "";
-    const res2 = await requestJson(ctx, `/v1/packs/-/search${q ? `?q=${encodeURIComponent(q)}` : ""}`);
+    const res2 = await catalogRead(ctx, `/-/search${q ? `?q=${encodeURIComponent(q)}` : ""}`);
     if (ctx.json) {
       writeJson(ctx.io.stdout, res2.body);
       return 0;
@@ -4559,7 +4570,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
   }
   if (verb === "get") {
     if (positionals.length !== 1) throw new CliError("Usage: openwop catalog packs get <packName> [--json]", 2);
-    const res2 = await requestJson(ctx, `/v1/packs/${encodeURIComponent(positionals[0])}`);
+    const res2 = await catalogRead(ctx, `/${encodeURIComponent(positionals[0])}`);
     if (ctx.json) {
       writeJson(ctx.io.stdout, res2.body);
       return 0;
@@ -4570,7 +4581,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
     for (const n of nodes) writeLine(ctx.io.stdout, `  ${n}`);
     return 0;
   }
-  const res = await requestJson(ctx, "/v1/packs/export");
+  const res = await catalogRead(ctx, "/export");
   if (options.out) {
     writeFileSync4(String(options.out), `${JSON.stringify(res.body, null, 2)}
 `);
@@ -14917,13 +14928,21 @@ Approve a code ONLY if you just ran \`openwop login\` yourself.
 Exit codes: 0 signed in / signed out \xB7 1 denied, expired or not available on this host \xB7 2 usage.
 
 Examples:
-  export OPENWOP_BASE_URL=https://app.openwop.dev/api
+  export OPENWOP_BASE_URL=https://api.openwop.dev
   openwop login
   openwop login --label "work laptop"
   openwop logout
 `;
 var sleep2 = (ms2) => new Promise((r) => setTimeout(r, ms2));
-function approvalUrl(baseUrl, path) {
+function approvalUrl(baseUrl, path, uri) {
+  if (typeof uri === "string") {
+    try {
+      const u = new URL(uri);
+      const loopback = u.hostname === "localhost" || u.hostname === "127.0.0.1" || u.hostname === "[::1]";
+      if (u.protocol === "https:" || u.protocol === "http:" && loopback) return u.toString();
+    } catch {
+    }
+  }
   const p = typeof path === "string" && path.startsWith("/") ? path : "/access?tab=api-keys";
   try {
     return `${new URL(baseUrl).origin}${p}`;
@@ -14961,7 +14980,7 @@ async function runLogin(ctx, argv) {
   const userCode = started?.userCode;
   if (typeof deviceCode !== "string" || typeof userCode !== "string") throw notAvailable(ctx);
   writeLine(ctx.io.stderr, "");
-  writeLine(ctx.io.stderr, `  1. Open   ${approvalUrl(ctx.baseUrl, started.verificationPath)}`);
+  writeLine(ctx.io.stderr, `  1. Open   ${approvalUrl(ctx.baseUrl, started.verificationPath, started.verificationUri)}`);
   writeLine(ctx.io.stderr, `  2. Enter  ${userCode}   under "Sign in the OpenWOP CLI", and approve.`);
   writeLine(ctx.io.stderr, "");
   writeLine(ctx.io.stderr, "Waiting for approval\u2026");

package/package.json

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