@topolo/cli 0.1.27 → 0.1.29

package/dist/index.js

@@ -89,7 +89,7 @@ var SERVICES = {
   inventory: "https://inventory.topolo.app",
   learn: "https://learn-api.topolo.app",
   localize: "https://localize.topolo.app",
-  mail: "https://mail.topolo.app",
+  mail: "https://mail-api.topolo.app",
   mdm: "https://mdm-api.topolo.app",
   messages: "https://messages.topolo.app",
   nexus: "https://nexus-api.topolo.app",
@@ -925,15 +925,17 @@ var APPLICATIONS = {
           "mail.topolo.app"
         ],
         "routes": [],
-        "serviceId": "mail"
+        "serviceId": null
       },
       {
         "name": "topolo-mail-api",
         "kind": "worker",
-        "apiUrl": null,
-        "domains": [],
+        "apiUrl": "https://mail-api.topolo.app",
+        "domains": [
+          "mail-api.topolo.app"
+        ],
         "routes": [],
-        "serviceId": null
+        "serviceId": "mail"
       }
     ]
   },
@@ -2046,15 +2048,63 @@ function statusRank(status) {
   return 2;
 }
 var DEFAULT_SERVICE_URLS = SERVICES;
+function resolveCatalogServiceUrl(entry, options = {}) {
+  const keys = catalogServiceKeyCandidates(entry, options.serviceKey);
+  const override = resolveServiceUrlOverride(keys, options.overrides);
+  if (override) return override;
+  const apiBaseUrl = firstString(entry.apiBaseUrl, entry.api_base_url);
+  if (apiBaseUrl) return apiBaseUrl;
+  return null;
+}
 function resolveServiceUrl(service, overrides) {
-  const override = overrides?.[service];
+  const override = resolveServiceUrlOverride([service], overrides);
   if (override) return override;
-  const envKey = `TOPOLO_SERVICE_URL_${service.replace(/\./g, "_").toUpperCase()}`;
-  const envValue = typeof process !== "undefined" ? process.env?.[envKey] : void 0;
-  if (envValue) return envValue;
   return DEFAULT_SERVICE_URLS[service];
 }
+function catalogServiceKeyCandidates(entry, preferred) {
+  const values = [preferred, entry.slug, entry.name, entry.serviceId].filter(
+    (value) => typeof value === "string" && value.trim().length > 0
+  );
+  const keys = /* @__PURE__ */ new Set();
+  for (const value of values) {
+    for (const candidate of serviceKeyCandidates(value)) keys.add(candidate);
+  }
+  return [...keys];
+}
+function serviceKeyCandidates(value) {
+  const normalized = value.trim().toLowerCase().replace(/\s+/g, "-");
+  const withoutTopolo = normalized.startsWith("topolo-") ? normalized.slice("topolo-".length) : normalized;
+  return [.../* @__PURE__ */ new Set([
+    normalized,
+    normalized.replace(/-/g, "_"),
+    withoutTopolo,
+    withoutTopolo.replace(/-/g, "_")
+  ])].filter(Boolean);
+}
+function resolveServiceUrlOverride(keys, overrides) {
+  for (const key of keys) {
+    const direct = overrides?.[key];
+    if (direct) return direct;
+    const envStyleKey = key.replace(/\./g, "_");
+    const envStyle = overrides?.[envStyleKey];
+    if (envStyle) return envStyle;
+  }
+  for (const key of keys) {
+    const envKey = `TOPOLO_SERVICE_URL_${key.replace(/\./g, "_").toUpperCase()}`;
+    const envValue = typeof process !== "undefined" ? process.env?.[envKey] : void 0;
+    if (envValue) return envValue;
+  }
+  return null;
+}
+function firstString(...values) {
+  for (const value of values) {
+    if (typeof value === "string" && value.trim()) return value.trim();
+  }
+  return null;
+}
 var WRITE_METHODS = /* @__PURE__ */ new Set(["POST", "PUT", "PATCH", "DELETE"]);
+var TOPOLO_ACTION_ID_HEADER = "X-Topolo-Action-Id";
+var TOPOLO_ACTION_NAME_HEADER = "X-Topolo-Action-Name";
 var POSITIVE_CACHE_TTL_MS = 5 * 60 * 1e3;
 var NEGATIVE_CACHE_TTL_MS = 60 * 1e3;
 var CATALOG_CACHE_TTL_MS = 60 * 1e3;
@@ -2222,8 +2272,12 @@ var TopoloClient = class _TopoloClient {
   async resolveLiveCallableService(serviceKey) {
     const catalog = await this.listServices();
     const match = catalog.find((entry) => catalogEntryMatches(entry, serviceKey));
-    if (!match?.baseUrl || !isCallableCatalogEntry(match)) return null;
-    return { serviceKey, baseUrl: match.baseUrl };
+    if (!match) return null;
+    const baseUrl = resolveCatalogServiceUrl(match, {
+      serviceKey,
+      overrides: this.serviceUrls
+    });
+    return baseUrl ? { serviceKey, baseUrl } : null;
   }
   /**
    * Resolve a service-slug → opaque service-id via caller config or TopoloAuth.
@@ -2316,7 +2370,8 @@ var TopoloClient = class _TopoloClient {
         slug: typeof s.app_slug === "string" ? s.app_slug : null,
         name: typeof s.name === "string" ? s.name : null,
         description: typeof s.description === "string" ? s.description : null,
-        baseUrl: typeof s.base_url === "string" ? s.base_url : null,
+        apiBaseUrl: typeof s.api_base_url === "string" ? s.api_base_url : typeof s.apiBaseUrl === "string" ? s.apiBaseUrl : null,
+        launchUrl: typeof s.launch_url === "string" ? s.launch_url : typeof s.launchUrl === "string" ? s.launchUrl : null,
         status: typeof s.status === "string" ? s.status : null,
         surfaceKind: typeof s.surface_kind === "string" ? s.surface_kind : null,
         launchable: s.launchable === true,
@@ -2383,6 +2438,10 @@ var TopoloClient = class _TopoloClient {
       path: mapped.path,
       ...mapped.query ? { query: mapped.query } : {},
       ...mapped.body !== void 0 ? { body: mapped.body } : {},
+      headers: {
+        [TOPOLO_ACTION_ID_HEADER]: entry.actionId,
+        [TOPOLO_ACTION_NAME_HEADER]: entry.name
+      },
       confirm: options.confirm === true
     });
   }
@@ -2397,7 +2456,8 @@ var TopoloClient = class _TopoloClient {
       slug: app.id,
       name: app.name ?? app.id,
       description: null,
-      baseUrl: app.productionUrl ?? null,
+      apiBaseUrl: null,
+      launchUrl: app.productionUrl ?? null,
       status: "bundled",
       surfaceKind: "application",
       launchable: Boolean(app.productionUrl),
@@ -2441,7 +2501,7 @@ var TopoloClient = class _TopoloClient {
   }
 };
 function resolveConfiguredServiceId(slug, serviceIds) {
-  for (const serviceKey of serviceKeyCandidates(slug)) {
+  for (const serviceKey of serviceKeyCandidates2(slug)) {
     const configured = serviceIds?.[serviceKey];
     if (typeof configured === "string" && configured.trim()) return configured.trim();
     const envKey = `TOPOLO_SERVICE_ID_${serviceKey.replace(/\./g, "_").toUpperCase()}`;
@@ -2451,7 +2511,7 @@ function resolveConfiguredServiceId(slug, serviceIds) {
   return null;
 }
 function resolveConfiguredServiceUrl(slug, serviceUrls) {
-  for (const serviceKey of serviceKeyCandidates(slug)) {
+  for (const serviceKey of serviceKeyCandidates2(slug)) {
     const configured = serviceUrls?.[serviceKey];
     if (typeof configured === "string" && configured.trim()) return configured.trim();
     const envKey = `TOPOLO_SERVICE_URL_${serviceKey.replace(/\./g, "_").toUpperCase()}`;
@@ -2460,7 +2520,7 @@ function resolveConfiguredServiceUrl(slug, serviceUrls) {
   }
   return null;
 }
-function serviceKeyCandidates(slug) {
+function serviceKeyCandidates2(slug) {
   const normalized = normalizeLookupKey(slug);
   const withoutTopolo = normalized.startsWith("topolo-") ? normalized.slice("topolo-".length) : normalized;
   return [.../* @__PURE__ */ new Set([
@@ -2482,19 +2542,12 @@ function catalogEntryLookupKeys(entry) {
   for (const value of values) {
     const normalized = normalizeLookupKey(value);
     if (!normalized) continue;
-    for (const candidate of serviceKeyCandidates(normalized)) {
+    for (const candidate of serviceKeyCandidates2(normalized)) {
       keys.add(candidate);
     }
   }
   return [...keys];
 }
-function isCallableCatalogEntry(entry) {
-  const kind = normalizeLookupKey(entry.surfaceKind || "");
-  if (kind === "api" || kind === "technical_service" || kind === "service") return true;
-  return Boolean(
-    entry.baseUrl && catalogEntryLookupKeys(entry).some((key) => Object.prototype.hasOwnProperty.call(DEFAULT_SERVICE_URLS, key))
-  );
-}
 function normalizeActionCatalogEntry(item) {
   if (!item || typeof item !== "object" || Array.isArray(item)) return null;
   const a = item;
@@ -8167,7 +8220,7 @@ function applicationRowsFromCatalog(catalog) {
     name: entry.name ?? entry.slug ?? entry.serviceId,
     appDir: "-",
     packageName: null,
-    productionUrl: entry.baseUrl,
+    productionUrl: entry.launchUrl ?? null,
     services: [displayCatalogId(entry)],
     deployTargets: 0
   })).sort((left, right) => left.id.localeCompare(right.id));
@@ -8754,7 +8807,7 @@ function buildRows(catalog, overrides, environment = selectedEnvironment()) {
   const resolvedOverrides = resolveServiceUrls(overrides, environment);
   return catalog.map((entry) => {
     const id = displayServiceId(entry);
-    const defaultUrl = defaultServiceUrl(id, entry.baseUrl);
+    const defaultUrl = defaultServiceUrl(id, entry);
     const configuredUrl = configuredServiceUrl(id, resolvedOverrides);
     const effectiveUrl = configuredUrl || defaultUrl;
     return {
@@ -8764,22 +8817,23 @@ function buildRows(catalog, overrides, environment = selectedEnvironment()) {
       defaultUrl,
       effectiveUrl,
       overridden: Boolean(configuredUrl && configuredUrl !== defaultUrl),
-      environmentSafe: environment !== "staging" || isStagingUrl(effectiveUrl),
+      environmentSafe: environment !== "staging" || !effectiveUrl || isStagingUrl(effectiveUrl),
       permissions: [...entry.permissions]
     };
   }).sort((left, right) => left.id.localeCompare(right.id));
 }
 function formatRows2(rows, environment = selectedEnvironment()) {
   const idWidth = Math.max(3, ...rows.map((r) => r.id.length));
-  const urlWidth = Math.max(7, ...rows.map((r) => r.effectiveUrl.length));
+  const urlWidth = Math.max(7, ...rows.map((r) => (r.effectiveUrl ?? "-").length));
   const lines = [];
   lines.push(`Environment: ${environment}`);
   lines.push("");
   lines.push(`${"ID".padEnd(idWidth)}  ${"URL".padEnd(urlWidth)}  OVERRIDE  READY`);
   lines.push(`${"-".repeat(idWidth)}  ${"-".repeat(urlWidth)}  --------  -----`);
   for (const r of rows) {
+    const effectiveUrl = r.effectiveUrl ?? "-";
     lines.push(
-      `${r.id.padEnd(idWidth)}  ${r.effectiveUrl.padEnd(urlWidth)}  ${r.overridden ? "yes" : "".padEnd(8)}  ${r.environmentSafe ? "yes" : "no"}`
+      `${r.id.padEnd(idWidth)}  ${effectiveUrl.padEnd(urlWidth)}  ${r.overridden ? "yes" : "".padEnd(8)}  ${r.environmentSafe ? "yes" : "no"}`
     );
   }
   return lines.join("\n");
@@ -8799,8 +8853,8 @@ function displayServiceId(entry) {
   }
   return serviceIdCandidates(entry.slug || entry.serviceId)[0] || entry.serviceId;
 }
-function defaultServiceUrl(id, fallback) {
-  return fallback ?? DEFAULT_SERVICE_URLS[id] ?? "";
+function defaultServiceUrl(id, entry) {
+  return resolveCatalogServiceUrl(entry, { serviceKey: id });
 }
 function configuredServiceUrl(id, overrides) {
   if (!overrides) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topolo/cli",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Command-line interface for Topolo developers, operators, and agents, with internal first-party scaffolding available under the topolo platform namespace.",
   "type": "module",
   "bin": {