@topolo/cli 0.13.24 → 0.13.26

package/dist/index.js

@@ -308,7 +308,7 @@ import { Command, Help } from "commander";
 import { createInterface } from "readline/promises";
 import { stdin as input } from "process";
 
-// node_modules/.pnpm/@topolo+sdk@0.23.26/node_modules/@topolo/sdk/dist/index.js
+// node_modules/@topolo/sdk/dist/index.js
 function record(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
@@ -969,39 +969,256 @@ async function createDpopProof(input2) {
   );
   return `${header}.${claims}.${encodeBase64Url(signature)}`;
 }
-function hostnameHasSuffix(hostname, suffix) {
-  return hostname === suffix || hostname.endsWith(`.${suffix}`);
-}
-function workersDevAccountMatches(hostname, account) {
-  if (!hostname.endsWith(".workers.dev")) return false;
-  const labels = hostname.slice(0, -".workers.dev".length).split(".");
-  return labels.length >= 2 && labels.at(-1) === account;
+var TOPOLO_FIRST_PARTY_ORIGINS = Object.freeze({
+  production: Object.freeze([
+    "https://admin.topolo.app",
+    "https://agent.topolo.app",
+    "https://api.ol0.me",
+    "https://auth.topolo.app",
+    "https://backup.topolo.app",
+    "https://blog.topolo.app",
+    "https://books.topolo.app",
+    "https://brand.topolo.app",
+    "https://bugfix.topolo.app",
+    "https://bytes.topolo.app",
+    "https://calendar.topolo.app",
+    "https://campaigns.topolo.app",
+    "https://capacity.topolo.app",
+    "https://chat.topolo.app",
+    "https://commerce.topolo.app",
+    "https://compose.topolo.app",
+    "https://consent.topolo.app",
+    "https://contracts.topolo.app",
+    "https://crm.topolo.app",
+    "https://design.topolo.app",
+    "https://developers.topolo.app",
+    "https://director.topolo.app",
+    "https://docs.topolo.app",
+    "https://engage.topolo.app",
+    "https://events.topolo.app",
+    "https://feed-analytics-api.topolo.app",
+    "https://feed-api.topolo.app",
+    "https://flow.topolo.app",
+    "https://forecast.topolo.app",
+    "https://forms.topolo.app",
+    "https://home.topolo.app",
+    "https://insights.topolo.app",
+    "https://inventory.topolo.app",
+    "https://learn.topolo.app",
+    "https://localize.topolo.app",
+    "https://mail.topolo.app",
+    "https://mcp.topolo.app",
+    "https://mdm.topolo.app",
+    "https://messages.topolo.app",
+    "https://nexus.topolo.app",
+    "https://notify.topolo.app",
+    "https://nurture.topolo.app",
+    "https://observability-watch.topolo.app",
+    "https://p2p.topolo.app",
+    "https://pay.topolo.app",
+    "https://people.topolo.app",
+    "https://quro.topolo.app",
+    "https://recruit.topolo.app",
+    "https://render.topolo.app",
+    "https://roadmap.topolo.app",
+    "https://sign.topolo.app",
+    "https://socialize-api.topolo.app",
+    "https://spaces.topolo.app",
+    "https://speech.topolo.app",
+    "https://status.topolo.app",
+    "https://studio.topolo.app",
+    "https://success.topolo.app",
+    "https://support.topolo.app",
+    "https://survey.topolo.app",
+    "https://voice.topolo.app",
+    "https://web.topolo.app",
+    "https://www.topolo.app"
+  ]),
+  staging: Object.freeze([
+    "https://admin.stg.topolo.us",
+    "https://agent.stg.topolo.us",
+    "https://api.one.stg.topolo.us",
+    "https://auth.stg.topolo.us",
+    "https://backup.stg.topolo.us",
+    "https://blog.stg.topolo.us",
+    "https://books.stg.topolo.us",
+    "https://brand.stg.topolo.us",
+    "https://bugfix.stg.topolo.us",
+    "https://bytes.stg.topolo.us",
+    "https://calendar.stg.topolo.us",
+    "https://campaigns.stg.topolo.us",
+    "https://capacity.stg.topolo.us",
+    "https://chat.stg.topolo.us",
+    "https://commerce.stg.topolo.us",
+    "https://compose.stg.topolo.us",
+    "https://consent.stg.topolo.us",
+    "https://contracts.stg.topolo.us",
+    "https://crm.stg.topolo.us",
+    "https://design.stg.topolo.us",
+    "https://developers.stg.topolo.us",
+    "https://director.stg.topolo.us",
+    "https://docs.stg.topolo.us",
+    "https://engage.stg.topolo.us",
+    "https://events.stg.topolo.us",
+    "https://feed-analytics-api.stg.topolo.us",
+    "https://feed-api.stg.topolo.us",
+    "https://flow.stg.topolo.us",
+    "https://forecast.stg.topolo.us",
+    "https://forms.stg.topolo.us",
+    "https://home.stg.topolo.us",
+    "https://insights.stg.topolo.us",
+    "https://inventory.stg.topolo.us",
+    "https://learn.stg.topolo.us",
+    "https://localize.stg.topolo.us",
+    "https://mail.stg.topolo.us",
+    "https://mcp.stg.topolo.us",
+    "https://mdm.stg.topolo.us",
+    "https://messages.stg.topolo.us",
+    "https://nexus.stg.topolo.us",
+    "https://notify.stg.topolo.us",
+    "https://nurture.stg.topolo.us",
+    "https://observability-watch.stg.topolo.us",
+    "https://p2p.stg.topolo.us",
+    "https://pay.stg.topolo.us",
+    "https://people.stg.topolo.us",
+    "https://pulse.stg.topolo.us",
+    "https://recruit.stg.topolo.us",
+    "https://render.stg.topolo.us",
+    "https://roadmap.stg.topolo.us",
+    "https://seed.stg.topolo.us",
+    "https://sign.stg.topolo.us",
+    "https://socialize-api.stg.topolo.us",
+    "https://spaces.stg.topolo.us",
+    "https://speech.stg.topolo.us",
+    "https://status.stg.topolo.us",
+    "https://studio-api.stg.topolo.us",
+    "https://studio.stg.topolo.us",
+    "https://success.stg.topolo.us",
+    "https://support.stg.topolo.us",
+    "https://survey.stg.topolo.us",
+    "https://voice.stg.topolo.us",
+    "https://web.stg.topolo.us"
+  ]),
+  development: Object.freeze([
+    "https://admin.topolo.dev",
+    "https://agent.topolo.dev",
+    "https://api.one.topolo.dev",
+    "https://auth.topolo.dev",
+    "https://backup.topolo.dev",
+    "https://blog.topolo.dev",
+    "https://books.topolo.dev",
+    "https://brand.topolo.dev",
+    "https://bugfix.topolo.dev",
+    "https://bytes.topolo.dev",
+    "https://calendar.topolo.dev",
+    "https://campaigns.topolo.dev",
+    "https://capacity.topolo.dev",
+    "https://chat.topolo.dev",
+    "https://commerce.topolo.dev",
+    "https://compose.topolo.dev",
+    "https://consent.topolo.dev",
+    "https://contracts.topolo.dev",
+    "https://crm.topolo.dev",
+    "https://design.topolo.dev",
+    "https://developers.topolo.dev",
+    "https://director.topolo.dev",
+    "https://docs.topolo.dev",
+    "https://engage.topolo.dev",
+    "https://events.topolo.dev",
+    "https://feed-analytics-api.topolo.dev",
+    "https://feed-api.topolo.dev",
+    "https://flow.topolo.dev",
+    "https://forecast.topolo.dev",
+    "https://forms.topolo.dev",
+    "https://home.topolo.dev",
+    "https://insights.topolo.dev",
+    "https://inventory.topolo.dev",
+    "https://learn.topolo.dev",
+    "https://localize.topolo.dev",
+    "https://mail.topolo.dev",
+    "https://mcp.topolo.dev",
+    "https://mdm.topolo.dev",
+    "https://messages.topolo.dev",
+    "https://nexus.topolo.dev",
+    "https://notify.topolo.dev",
+    "https://nurture.topolo.dev",
+    "https://observability-watch.topolo.dev",
+    "https://p2p.topolo.dev",
+    "https://pay.topolo.dev",
+    "https://people.topolo.dev",
+    "https://pulse.topolo.dev",
+    "https://recruit.topolo.dev",
+    "https://render.topolo.dev",
+    "https://roadmap.topolo.dev",
+    "https://seed.topolo.dev",
+    "https://sign.topolo.dev",
+    "https://socialize-api.topolo.dev",
+    "https://spaces.topolo.dev",
+    "https://speech.topolo.dev",
+    "https://status.topolo.dev",
+    "https://studio-api.topolo.dev",
+    "https://studio.topolo.dev",
+    "https://success.topolo.dev",
+    "https://support.topolo.dev",
+    "https://survey.topolo.dev",
+    "https://voice.topolo.dev",
+    "https://web.topolo.dev"
+  ])
+});
+var TOPOLO_REFUSED_HOST_SUFFIXES = Object.freeze(["sites.stg.topolo.us", "sites.topolo.app", "sites.topolo.dev", "topolo.site", "try.topolo.io", "workers.dev"]);
+var TOPOLO_RUNTIME_ENVIRONMENTS = ["production", "staging", "development", "local"];
+var TOPOLO_ENVIRONMENT_SERVICE_URLS = Object.freeze({
+  production: Object.freeze({
+    auth: "https://auth.topolo.app",
+    developers: "https://developers.topolo.app"
+  }),
+  staging: Object.freeze({
+    auth: "https://auth.stg.topolo.us",
+    developers: "https://developers.stg.topolo.us"
+  }),
+  development: Object.freeze({
+    auth: "https://auth.topolo.dev",
+    developers: "https://developers.topolo.dev"
+  }),
+  local: Object.freeze({})
+});
+var FIRST_PARTY_ORIGIN_SETS = Object.freeze({
+  production: new Set(TOPOLO_FIRST_PARTY_ORIGINS.production),
+  staging: new Set(TOPOLO_FIRST_PARTY_ORIGINS.staging),
+  development: new Set(TOPOLO_FIRST_PARTY_ORIGINS.development)
+});
+var LOOPBACK_HOSTNAMES = /* @__PURE__ */ new Set(["localhost", "127.0.0.1", "[::1]"]);
+function isRuntimeEnvironment(value) {
+  return typeof value === "string" && TOPOLO_RUNTIME_ENVIRONMENTS.includes(value);
 }
-function originMatchesEnvironment(url, environment) {
-  const hostname = url.hostname.toLowerCase();
+function originIsFirstParty(url, environment) {
   if (environment === "local") {
-    return hostname === "localhost" || hostname.endsWith(".localhost") || hostname === "127.0.0.1" || hostname === "[::1]";
+    return (url.protocol === "http:" || url.protocol === "https:") && LOOPBACK_HOSTNAMES.has(url.hostname);
   }
   if (url.protocol !== "https:") return false;
-  if (environment === "production") {
-    return hostnameHasSuffix(hostname, "topolo.app") || hostnameHasSuffix(hostname, "topolo.io") || hostname === "api.ol0.me" || workersDevAccountMatches(hostname, "topolo");
-  }
-  if (environment === "staging") {
-    return hostnameHasSuffix(hostname, "stg.topolo.us") || workersDevAccountMatches(hostname, "topolo-staging");
+  return FIRST_PARTY_ORIGIN_SETS[environment].has(url.origin);
+}
+function requireTopoloRuntimeEnvironment(environment) {
+  if (!isRuntimeEnvironment(environment)) {
+    throw new TopoloSdkError(
+      "environment_required",
+      'Refusing to send a Topolo credential: the runtime environment is not resolved. Pass environment: "production" | "staging" | "development" | "local".'
+    );
   }
-  return hostnameHasSuffix(hostname, "topolo.dev") || workersDevAccountMatches(hostname, "topolo-development");
+  return environment;
 }
 function assertTopoloServiceUrlEnvironment(service, value, environment) {
+  const resolved = requireTopoloRuntimeEnvironment(environment);
   let url;
   try {
     url = new URL(value);
   } catch {
     throw new TopoloSdkError("invalid_service_url", `Invalid URL configured for Topolo service "${service}".`);
   }
-  if (url.protocol !== "https:" && url.protocol !== "http:" || url.username || url.password || !originMatchesEnvironment(url, environment)) {
+  if (url.protocol !== "https:" && url.protocol !== "http:" || url.username || url.password || !originIsFirstParty(url, resolved)) {
     throw new TopoloSdkError(
       "environment_mismatch",
-      `Refusing Topolo service "${service}": ${url.origin} does not belong to ${environment}.`
+      `Refusing Topolo service "${service}": ${url.origin} is not a first-party ${resolved} service origin.`
     );
   }
   return url.origin;
@@ -1014,6 +1231,44 @@ function topoloServiceOrigins(serviceUrls, environment) {
     ])
   );
 }
+var REDIRECT_STATUSES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+async function fetchWithCredentialBoundary(fetchImpl, environment, service, target, init) {
+  const url = new URL(String(target));
+  const origin = assertTopoloServiceUrlEnvironment(service, url.toString(), environment);
+  const response = await fetchImpl(url.toString(), { ...init, redirect: "manual" });
+  let responseOrigin = origin;
+  try {
+    if (response.url) responseOrigin = new URL(response.url).origin;
+  } catch {
+    responseOrigin = "";
+  }
+  if (response.redirected === true || responseOrigin !== origin) {
+    await response.body?.cancel().catch(() => void 0);
+    throw new TopoloSdkError(
+      "credential_redirect_refused",
+      `Refusing a redirected response from Topolo service "${service}"; credentials are never forwarded.`
+    );
+  }
+  if (REDIRECT_STATUSES.has(response.status)) {
+    const location = response.headers.get("Location");
+    let destination = null;
+    if (location !== null) {
+      try {
+        destination = new URL(location, url).origin;
+      } catch {
+        destination = null;
+      }
+    }
+    if (location !== null && destination !== origin) {
+      await response.body?.cancel().catch(() => void 0);
+      throw new TopoloSdkError(
+        "credential_redirect_refused",
+        `Refusing a redirect from Topolo service "${service}" to another origin; credentials are never forwarded.`
+      );
+    }
+  }
+  return response;
+}
 var APP_API_URLS = {
   auth: "https://auth.topolo.app",
   developers: "https://developers.topolo.app"
@@ -1036,9 +1291,15 @@ function resolveCatalogServiceUrl(entry, options = {}) {
   if (apiBaseUrl) return apiBaseUrl;
   return null;
 }
-function resolveServiceUrl(service, overrides) {
+function resolveServiceUrl(service, overrides, environment) {
   const override = resolveServiceUrlOverride([service], overrides);
   if (override) return override;
+  if (environment !== void 0) {
+    const selected = requireTopoloRuntimeEnvironment(environment);
+    const origin = TOPOLO_ENVIRONMENT_SERVICE_URLS[selected][service];
+    if (!origin) throw new TopoloSdkError("service_url_required", `Configure an explicit ${service} origin for ${selected}.`);
+    return origin;
+  }
   return DEFAULT_APP_URLS[service];
 }
 function catalogServiceKeyCandidates(entry, preferred) {
@@ -1082,12 +1343,15 @@ function firstString(...values) {
   }
   return null;
 }
+var DATA_CLASSIFICATIONS = /* @__PURE__ */ new Set(["public", "internal", "confidential", "restricted", "public_link"]);
+var TOPOLO_REFERENCE_PATTERN = /^topolo:app_[a-z0-9]+(?:_[a-z0-9]+)+\/[A-Za-z0-9][A-Za-z0-9_-]{0,127}\/[a-z][a-z0-9_]*\.[a-z][a-z0-9_]*\/[A-Za-z0-9][A-Za-z0-9_.:-]{0,255}(?:@([1-9][0-9]*))?(?![\s\S])/;
 var SUPPORTED_SCHEMA_KEYWORDS = /* @__PURE__ */ new Set([
   "$schema",
   "$id",
   "$ref",
   "$defs",
   "definitions",
+  "dataClassification",
   "title",
   "description",
   "default",
@@ -1138,7 +1402,10 @@ function inspectSchema(schema, path, root, depth) {
   if (unsupportedKeyword) {
     return { path, code: "unsupported_schema_keyword", message: `Action schema uses unsupported keyword ${unsupportedKeyword}.` };
   }
-  if (typeof schema.format === "string" && !["uri", "email", "date-time", "uuid"].includes(schema.format)) {
+  if (Object.hasOwn(schema, "dataClassification") && !DATA_CLASSIFICATIONS.has(schema.dataClassification)) {
+    return { path: `${path}.dataClassification`, code: "invalid_data_classification", message: "Schema dataClassification must be public, internal, confidential, restricted or public_link." };
+  }
+  if (typeof schema.format === "string" && !["uri", "email", "date-time", "uuid", "topolo-reference"].includes(schema.format)) {
     return { path, code: "unsupported_schema_format", message: `Action schema uses unsupported format ${schema.format}.` };
   }
   if (typeof schema.$ref === "string" && !resolveLocalReference(root, schema.$ref)) {
@@ -1300,6 +1567,10 @@ function validateString(schema, value, path, errors) {
       errors.push({ path, code: "invalid_schema_pattern", message: "Action schema contains an invalid pattern." });
     }
   }
+  if (schema.format === "topolo-reference") {
+    const match = TOPOLO_REFERENCE_PATTERN.exec(value);
+    if (!match || match[1] !== void 0 && !Number.isSafeInteger(Number(match[1]))) errors.push({ path, code: "format_topolo_reference", message: "Expected a canonical Topolo resource reference." });
+  }
   if (schema.format === "uri" && !isUrl(value)) errors.push({ path, code: "format_uri", message: "Expected an absolute URL." });
   if (schema.format === "email" && !/^[^@\s]+@[^@\s]+\.[^@\s]+$/.test(value)) errors.push({ path, code: "format_email", message: "Expected an email address." });
   if (schema.format === "date-time" && !isDateTime(value)) errors.push({ path, code: "format_date_time", message: "Expected an ISO-8601 date-time." });
@@ -1869,6 +2140,7 @@ var TopoloClient = class _TopoloClient {
    * use and for the generic `topolo api` / MCP passthrough tool.
    */
   async request(opts) {
+    requireTopoloRuntimeEnvironment(this.environment);
     const method = opts.method ?? "GET";
     if (this.requireConfirmForWrites && WRITE_METHODS.has(method) && !opts.confirm) {
       throw new TopoloConfirmationRequiredError(
@@ -1950,7 +2222,7 @@ var TopoloClient = class _TopoloClient {
             privateJwk: requestCredential.privateJwk
           }));
         }
-        return await this.fetchImpl(urlStr, {
+        return await this.credentialedFetch(resolvedService.serviceKey, urlStr, {
           method,
           headers: requestHeaders,
           body: opts.rawBody ?? (opts.body !== void 0 ? JSON.stringify(opts.body) : null),
@@ -2132,8 +2404,11 @@ var TopoloClient = class _TopoloClient {
     return this.refreshInFlight;
   }
   validatedServiceOrigin(service, value) {
-    const origin = requireHttpOrigin(value);
-    return this.environment ? assertTopoloServiceUrlEnvironment(service, origin, this.environment) : origin;
+    return assertTopoloServiceUrlEnvironment(service, requireHttpOrigin(value), this.environment);
+  }
+  /** The only door to the network for anything this client sends; see fetchWithCredentialBoundary. */
+  credentialedFetch(service, target, init) {
+    return fetchWithCredentialBoundary((input2, requestInit) => this.fetchImpl(input2, requestInit), this.environment, service, target, init);
   }
   validatedActionEntry(entry) {
     if (!entry.apiBaseUrl) return entry;
@@ -2156,7 +2431,7 @@ var TopoloClient = class _TopoloClient {
       }
       return {
         serviceKey,
-        baseUrl: this.validatedServiceOrigin(serviceKey, DEFAULT_APP_URLS[serviceKey])
+        baseUrl: this.validatedServiceOrigin(serviceKey, resolveServiceUrl(serviceKey, this.serviceUrls, this.environment))
       };
     }
     const live = await this.resolveLiveCallableService(serviceKey);
@@ -2199,7 +2474,7 @@ var TopoloClient = class _TopoloClient {
     if (!normalized) return null;
     const configuredAppId = resolveConfiguredAppId(normalized, this.appIds);
     if (configuredAppId) return configuredAppId;
-    const authBase = this.validatedServiceOrigin("developers", resolveServiceUrl("developers", this.serviceUrls));
+    const authBase = this.validatedServiceOrigin("developers", resolveServiceUrl("developers", this.serviceUrls, this.environment));
     const cacheKey = `${authBase}|${normalized}`;
     const now = Date.now();
     const cached = _TopoloClient.appIdCache.get(cacheKey);
@@ -2212,7 +2487,7 @@ var TopoloClient = class _TopoloClient {
     ).toString();
     let res;
     try {
-      res = await this.fetchImpl(url, {
+      res = await this.credentialedFetch("developers", url, {
         method: "GET",
         headers: { Accept: "application/json" }
       });
@@ -2496,7 +2771,7 @@ var TopoloClient = class _TopoloClient {
   }
   async putUrlSessionContent(entry, uploadUrl, method, bytes, options) {
     const service = entry.appSlug || entry.appId;
-    const resolved = entry.apiBaseUrl ? { serviceKey: normalizeLookupKey(service), baseUrl: requireHttpOrigin(entry.apiBaseUrl) } : await this.resolveRequestService(service);
+    const resolved = entry.apiBaseUrl ? { serviceKey: normalizeLookupKey(service), baseUrl: this.validatedServiceOrigin(service, entry.apiBaseUrl) } : await this.resolveRequestService(service);
     const target = new URL(uploadUrl, resolved.baseUrl.endsWith("/") ? resolved.baseUrl : `${resolved.baseUrl}/`);
     const body = bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
     if (target.origin === new URL(resolved.baseUrl).origin) {
@@ -2512,7 +2787,7 @@ var TopoloClient = class _TopoloClient {
       });
       return;
     }
-    const response = await this.fetchImpl(target, {
+    const response = await this.credentialedFetch(service, target, {
       method,
       headers: { "Content-Type": options.contentType.trim().toLowerCase() },
       body
@@ -3448,9 +3723,11 @@ var DEVICE_GRANT = "urn:ietf:params:oauth:grant-type:device_code";
 var TopoloOAuth = class {
   baseUrl;
   fetchImpl;
+  environment;
   constructor(options = {}) {
-    this.baseUrl = options.environment ? assertTopoloServiceUrlEnvironment("auth", resolveServiceUrl("auth", options.serviceUrls), options.environment) : resolveServiceUrl("auth", options.serviceUrls);
+    this.baseUrl = resolveServiceUrl("auth", options.serviceUrls, options.environment);
     this.fetchImpl = options.fetch ?? fetch;
+    this.environment = options.environment;
   }
   /**
    * RFC 8628 device authorization grant — starts the flow by asking the server
@@ -3515,7 +3792,7 @@ var TopoloOAuth = class {
   }
   async #postForm(path, body) {
     const url = new URL(path, this.baseUrl.endsWith("/") ? this.baseUrl : `${this.baseUrl}/`);
-    const res = await this.fetchImpl(url.toString(), {
+    const res = await fetchWithCredentialBoundary(this.fetchImpl, this.environment, "auth", url, {
       method: "POST",
       headers: {
         "Content-Type": "application/x-www-form-urlencoded",
@@ -4044,7 +4321,7 @@ async function pollUntilApproved(params) {
 // src/commands/auth-lock.ts
 import { createHash as createHash3 } from "crypto";
 
-// node_modules/.pnpm/@topolo+sdk@0.23.26/node_modules/@topolo/sdk/dist/node/credential-store.js
+// node_modules/@topolo/sdk/dist/node/credential-store.js
 import { mkdir as mkdir2, readFile as readFile2, chmod as chmod2, lstat, readdir as readdir2 } from "fs/promises";
 import { existsSync as existsSync2, mkdirSync, lstatSync, readdirSync, readFileSync as readFileSync2, openSync, writeFileSync, fsyncSync, closeSync, renameSync, unlinkSync, rmdirSync, linkSync } from "fs";
 import { createHash as createHash2, randomUUID as randomUUID2 } from "crypto";
@@ -4386,55 +4663,256 @@ var TopoloReauthRequiredError2 = class extends TopoloAuthError2 {
     this.reauthorization = Object.freeze({ ...reauthorization });
   }
 };
-var TOPOLO_RUNTIME_ENVIRONMENTS = ["production", "staging", "development", "local"];
-var TOPOLO_ENVIRONMENT_SERVICE_URLS = {
-  production: {
+var TOPOLO_FIRST_PARTY_ORIGINS2 = Object.freeze({
+  production: Object.freeze([
+    "https://admin.topolo.app",
+    "https://agent.topolo.app",
+    "https://api.ol0.me",
+    "https://auth.topolo.app",
+    "https://backup.topolo.app",
+    "https://blog.topolo.app",
+    "https://books.topolo.app",
+    "https://brand.topolo.app",
+    "https://bugfix.topolo.app",
+    "https://bytes.topolo.app",
+    "https://calendar.topolo.app",
+    "https://campaigns.topolo.app",
+    "https://capacity.topolo.app",
+    "https://chat.topolo.app",
+    "https://commerce.topolo.app",
+    "https://compose.topolo.app",
+    "https://consent.topolo.app",
+    "https://contracts.topolo.app",
+    "https://crm.topolo.app",
+    "https://design.topolo.app",
+    "https://developers.topolo.app",
+    "https://director.topolo.app",
+    "https://docs.topolo.app",
+    "https://engage.topolo.app",
+    "https://events.topolo.app",
+    "https://feed-analytics-api.topolo.app",
+    "https://feed-api.topolo.app",
+    "https://flow.topolo.app",
+    "https://forecast.topolo.app",
+    "https://forms.topolo.app",
+    "https://home.topolo.app",
+    "https://insights.topolo.app",
+    "https://inventory.topolo.app",
+    "https://learn.topolo.app",
+    "https://localize.topolo.app",
+    "https://mail.topolo.app",
+    "https://mcp.topolo.app",
+    "https://mdm.topolo.app",
+    "https://messages.topolo.app",
+    "https://nexus.topolo.app",
+    "https://notify.topolo.app",
+    "https://nurture.topolo.app",
+    "https://observability-watch.topolo.app",
+    "https://p2p.topolo.app",
+    "https://pay.topolo.app",
+    "https://people.topolo.app",
+    "https://quro.topolo.app",
+    "https://recruit.topolo.app",
+    "https://render.topolo.app",
+    "https://roadmap.topolo.app",
+    "https://sign.topolo.app",
+    "https://socialize-api.topolo.app",
+    "https://spaces.topolo.app",
+    "https://speech.topolo.app",
+    "https://status.topolo.app",
+    "https://studio.topolo.app",
+    "https://success.topolo.app",
+    "https://support.topolo.app",
+    "https://survey.topolo.app",
+    "https://voice.topolo.app",
+    "https://web.topolo.app",
+    "https://www.topolo.app"
+  ]),
+  staging: Object.freeze([
+    "https://admin.stg.topolo.us",
+    "https://agent.stg.topolo.us",
+    "https://api.one.stg.topolo.us",
+    "https://auth.stg.topolo.us",
+    "https://backup.stg.topolo.us",
+    "https://blog.stg.topolo.us",
+    "https://books.stg.topolo.us",
+    "https://brand.stg.topolo.us",
+    "https://bugfix.stg.topolo.us",
+    "https://bytes.stg.topolo.us",
+    "https://calendar.stg.topolo.us",
+    "https://campaigns.stg.topolo.us",
+    "https://capacity.stg.topolo.us",
+    "https://chat.stg.topolo.us",
+    "https://commerce.stg.topolo.us",
+    "https://compose.stg.topolo.us",
+    "https://consent.stg.topolo.us",
+    "https://contracts.stg.topolo.us",
+    "https://crm.stg.topolo.us",
+    "https://design.stg.topolo.us",
+    "https://developers.stg.topolo.us",
+    "https://director.stg.topolo.us",
+    "https://docs.stg.topolo.us",
+    "https://engage.stg.topolo.us",
+    "https://events.stg.topolo.us",
+    "https://feed-analytics-api.stg.topolo.us",
+    "https://feed-api.stg.topolo.us",
+    "https://flow.stg.topolo.us",
+    "https://forecast.stg.topolo.us",
+    "https://forms.stg.topolo.us",
+    "https://home.stg.topolo.us",
+    "https://insights.stg.topolo.us",
+    "https://inventory.stg.topolo.us",
+    "https://learn.stg.topolo.us",
+    "https://localize.stg.topolo.us",
+    "https://mail.stg.topolo.us",
+    "https://mcp.stg.topolo.us",
+    "https://mdm.stg.topolo.us",
+    "https://messages.stg.topolo.us",
+    "https://nexus.stg.topolo.us",
+    "https://notify.stg.topolo.us",
+    "https://nurture.stg.topolo.us",
+    "https://observability-watch.stg.topolo.us",
+    "https://p2p.stg.topolo.us",
+    "https://pay.stg.topolo.us",
+    "https://people.stg.topolo.us",
+    "https://pulse.stg.topolo.us",
+    "https://recruit.stg.topolo.us",
+    "https://render.stg.topolo.us",
+    "https://roadmap.stg.topolo.us",
+    "https://seed.stg.topolo.us",
+    "https://sign.stg.topolo.us",
+    "https://socialize-api.stg.topolo.us",
+    "https://spaces.stg.topolo.us",
+    "https://speech.stg.topolo.us",
+    "https://status.stg.topolo.us",
+    "https://studio-api.stg.topolo.us",
+    "https://studio.stg.topolo.us",
+    "https://success.stg.topolo.us",
+    "https://support.stg.topolo.us",
+    "https://survey.stg.topolo.us",
+    "https://voice.stg.topolo.us",
+    "https://web.stg.topolo.us"
+  ]),
+  development: Object.freeze([
+    "https://admin.topolo.dev",
+    "https://agent.topolo.dev",
+    "https://api.one.topolo.dev",
+    "https://auth.topolo.dev",
+    "https://backup.topolo.dev",
+    "https://blog.topolo.dev",
+    "https://books.topolo.dev",
+    "https://brand.topolo.dev",
+    "https://bugfix.topolo.dev",
+    "https://bytes.topolo.dev",
+    "https://calendar.topolo.dev",
+    "https://campaigns.topolo.dev",
+    "https://capacity.topolo.dev",
+    "https://chat.topolo.dev",
+    "https://commerce.topolo.dev",
+    "https://compose.topolo.dev",
+    "https://consent.topolo.dev",
+    "https://contracts.topolo.dev",
+    "https://crm.topolo.dev",
+    "https://design.topolo.dev",
+    "https://developers.topolo.dev",
+    "https://director.topolo.dev",
+    "https://docs.topolo.dev",
+    "https://engage.topolo.dev",
+    "https://events.topolo.dev",
+    "https://feed-analytics-api.topolo.dev",
+    "https://feed-api.topolo.dev",
+    "https://flow.topolo.dev",
+    "https://forecast.topolo.dev",
+    "https://forms.topolo.dev",
+    "https://home.topolo.dev",
+    "https://insights.topolo.dev",
+    "https://inventory.topolo.dev",
+    "https://learn.topolo.dev",
+    "https://localize.topolo.dev",
+    "https://mail.topolo.dev",
+    "https://mcp.topolo.dev",
+    "https://mdm.topolo.dev",
+    "https://messages.topolo.dev",
+    "https://nexus.topolo.dev",
+    "https://notify.topolo.dev",
+    "https://nurture.topolo.dev",
+    "https://observability-watch.topolo.dev",
+    "https://p2p.topolo.dev",
+    "https://pay.topolo.dev",
+    "https://people.topolo.dev",
+    "https://pulse.topolo.dev",
+    "https://recruit.topolo.dev",
+    "https://render.topolo.dev",
+    "https://roadmap.topolo.dev",
+    "https://seed.topolo.dev",
+    "https://sign.topolo.dev",
+    "https://socialize-api.topolo.dev",
+    "https://spaces.topolo.dev",
+    "https://speech.topolo.dev",
+    "https://status.topolo.dev",
+    "https://studio-api.topolo.dev",
+    "https://studio.topolo.dev",
+    "https://success.topolo.dev",
+    "https://support.topolo.dev",
+    "https://survey.topolo.dev",
+    "https://voice.topolo.dev",
+    "https://web.topolo.dev"
+  ])
+});
+var TOPOLO_REFUSED_HOST_SUFFIXES2 = Object.freeze(["sites.stg.topolo.us", "sites.topolo.app", "sites.topolo.dev", "topolo.site", "try.topolo.io", "workers.dev"]);
+var TOPOLO_RUNTIME_ENVIRONMENTS2 = ["production", "staging", "development", "local"];
+var TOPOLO_ENVIRONMENT_SERVICE_URLS2 = Object.freeze({
+  production: Object.freeze({
     auth: "https://auth.topolo.app",
     developers: "https://developers.topolo.app"
-  },
-  staging: {
+  }),
+  staging: Object.freeze({
     auth: "https://auth.stg.topolo.us",
     developers: "https://developers.stg.topolo.us"
-  },
-  development: {
+  }),
+  development: Object.freeze({
     auth: "https://auth.topolo.dev",
     developers: "https://developers.topolo.dev"
-  },
-  local: {}
-};
-function hostnameHasSuffix2(hostname, suffix) {
-  return hostname === suffix || hostname.endsWith(`.${suffix}`);
-}
-function workersDevAccountMatches2(hostname, account) {
-  if (!hostname.endsWith(".workers.dev")) return false;
-  const labels = hostname.slice(0, -".workers.dev".length).split(".");
-  return labels.length >= 2 && labels.at(-1) === account;
+  }),
+  local: Object.freeze({})
+});
+var FIRST_PARTY_ORIGIN_SETS2 = Object.freeze({
+  production: new Set(TOPOLO_FIRST_PARTY_ORIGINS2.production),
+  staging: new Set(TOPOLO_FIRST_PARTY_ORIGINS2.staging),
+  development: new Set(TOPOLO_FIRST_PARTY_ORIGINS2.development)
+});
+var LOOPBACK_HOSTNAMES2 = /* @__PURE__ */ new Set(["localhost", "127.0.0.1", "[::1]"]);
+function isRuntimeEnvironment2(value) {
+  return typeof value === "string" && TOPOLO_RUNTIME_ENVIRONMENTS2.includes(value);
 }
-function originMatchesEnvironment2(url, environment) {
-  const hostname = url.hostname.toLowerCase();
+function originIsFirstParty2(url, environment) {
   if (environment === "local") {
-    return hostname === "localhost" || hostname.endsWith(".localhost") || hostname === "127.0.0.1" || hostname === "[::1]";
+    return (url.protocol === "http:" || url.protocol === "https:") && LOOPBACK_HOSTNAMES2.has(url.hostname);
   }
   if (url.protocol !== "https:") return false;
-  if (environment === "production") {
-    return hostnameHasSuffix2(hostname, "topolo.app") || hostnameHasSuffix2(hostname, "topolo.io") || hostname === "api.ol0.me" || workersDevAccountMatches2(hostname, "topolo");
-  }
-  if (environment === "staging") {
-    return hostnameHasSuffix2(hostname, "stg.topolo.us") || workersDevAccountMatches2(hostname, "topolo-staging");
+  return FIRST_PARTY_ORIGIN_SETS2[environment].has(url.origin);
+}
+function requireTopoloRuntimeEnvironment2(environment) {
+  if (!isRuntimeEnvironment2(environment)) {
+    throw new TopoloSdkError2(
+      "environment_required",
+      'Refusing to send a Topolo credential: the runtime environment is not resolved. Pass environment: "production" | "staging" | "development" | "local".'
+    );
   }
-  return hostnameHasSuffix2(hostname, "topolo.dev") || workersDevAccountMatches2(hostname, "topolo-development");
+  return environment;
 }
 function assertTopoloServiceUrlEnvironment2(service, value, environment) {
+  const resolved = requireTopoloRuntimeEnvironment2(environment);
   let url;
   try {
     url = new URL(value);
   } catch {
     throw new TopoloSdkError2("invalid_service_url", `Invalid URL configured for Topolo service "${service}".`);
   }
-  if (url.protocol !== "https:" && url.protocol !== "http:" || url.username || url.password || !originMatchesEnvironment2(url, environment)) {
+  if (url.protocol !== "https:" && url.protocol !== "http:" || url.username || url.password || !originIsFirstParty2(url, resolved)) {
     throw new TopoloSdkError2(
       "environment_mismatch",
-      `Refusing Topolo service "${service}": ${url.origin} does not belong to ${environment}.`
+      `Refusing Topolo service "${service}": ${url.origin} is not a first-party ${resolved} service origin.`
     );
   }
   return url.origin;
@@ -4447,14 +4925,58 @@ function topoloServiceOrigins2(serviceUrls, environment) {
     ])
   );
 }
+var REDIRECT_STATUSES2 = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+async function fetchWithCredentialBoundary2(fetchImpl, environment, service, target, init) {
+  const url = new URL(String(target));
+  const origin = assertTopoloServiceUrlEnvironment2(service, url.toString(), environment);
+  const response = await fetchImpl(url.toString(), { ...init, redirect: "manual" });
+  let responseOrigin = origin;
+  try {
+    if (response.url) responseOrigin = new URL(response.url).origin;
+  } catch {
+    responseOrigin = "";
+  }
+  if (response.redirected === true || responseOrigin !== origin) {
+    await response.body?.cancel().catch(() => void 0);
+    throw new TopoloSdkError2(
+      "credential_redirect_refused",
+      `Refusing a redirected response from Topolo service "${service}"; credentials are never forwarded.`
+    );
+  }
+  if (REDIRECT_STATUSES2.has(response.status)) {
+    const location = response.headers.get("Location");
+    let destination = null;
+    if (location !== null) {
+      try {
+        destination = new URL(location, url).origin;
+      } catch {
+        destination = null;
+      }
+    }
+    if (location !== null && destination !== origin) {
+      await response.body?.cancel().catch(() => void 0);
+      throw new TopoloSdkError2(
+        "credential_redirect_refused",
+        `Refusing a redirect from Topolo service "${service}" to another origin; credentials are never forwarded.`
+      );
+    }
+  }
+  return response;
+}
 var APP_API_URLS2 = {
   auth: "https://auth.topolo.app",
   developers: "https://developers.topolo.app"
 };
 var DEFAULT_APP_URLS2 = APP_API_URLS2;
-function resolveServiceUrl2(service, overrides) {
+function resolveServiceUrl2(service, overrides, environment) {
   const override = resolveServiceUrlOverride2([service], overrides);
   if (override) return override;
+  if (environment !== void 0) {
+    const selected = requireTopoloRuntimeEnvironment2(environment);
+    const origin = TOPOLO_ENVIRONMENT_SERVICE_URLS2[selected][service];
+    if (!origin) throw new TopoloSdkError2("service_url_required", `Configure an explicit ${service} origin for ${selected}.`);
+    return origin;
+  }
   return DEFAULT_APP_URLS2[service];
 }
 function resolveServiceUrlOverride2(keys, overrides) {
@@ -4476,9 +4998,11 @@ var DEVICE_GRANT2 = "urn:ietf:params:oauth:grant-type:device_code";
 var TopoloOAuth2 = class {
   baseUrl;
   fetchImpl;
+  environment;
   constructor(options = {}) {
-    this.baseUrl = options.environment ? assertTopoloServiceUrlEnvironment2("auth", resolveServiceUrl2("auth", options.serviceUrls), options.environment) : resolveServiceUrl2("auth", options.serviceUrls);
+    this.baseUrl = resolveServiceUrl2("auth", options.serviceUrls, options.environment);
     this.fetchImpl = options.fetch ?? fetch;
+    this.environment = options.environment;
   }
   /**
    * RFC 8628 device authorization grant — starts the flow by asking the server
@@ -4543,7 +5067,7 @@ var TopoloOAuth2 = class {
   }
   async #postForm(path, body) {
     const url = new URL(path, this.baseUrl.endsWith("/") ? this.baseUrl : `${this.baseUrl}/`);
-    const res = await this.fetchImpl(url.toString(), {
+    const res = await fetchWithCredentialBoundary2(this.fetchImpl, this.environment, "auth", url, {
       method: "POST",
       headers: {
         "Content-Type": "application/x-www-form-urlencoded",
@@ -4823,11 +5347,11 @@ function createProtectedActionSecretStore(options) {
     }
   };
 }
-var TOPOLO_ENVIRONMENTS = TOPOLO_RUNTIME_ENVIRONMENTS;
+var TOPOLO_ENVIRONMENTS = TOPOLO_RUNTIME_ENVIRONMENTS2;
 function contextKey(contextType, organizationId) {
   return contextType === "organization" && organizationId ? `org:${organizationId}` : "personal";
 }
-var ENVIRONMENT_DEFAULT_SERVICE_URLS = TOPOLO_ENVIRONMENT_SERVICE_URLS;
+var ENVIRONMENT_DEFAULT_SERVICE_URLS = TOPOLO_ENVIRONMENT_SERVICE_URLS2;
 function configPath() {
   const override = process.env.TOPOLO_CONFIG_PATH;
   if (override) return override;
@@ -5155,7 +5679,7 @@ async function signOut(environment, options = {}) {
   if (options.revoke === false || !grants.length) return result;
   let oauth;
   try {
-    oauth = boundedOAuth(authServiceUrls(profile, environment, "sign-out"));
+    oauth = boundedOAuth(authServiceUrls(profile, environment, "sign-out"), environment);
   } catch {
     result.revocationFailed = grants.length;
     return result;
@@ -5203,14 +5727,14 @@ function configLockTimeoutMs() {
   const value = Number(process.env.TOPOLO_CONFIG_LOCK_TIMEOUT_MS);
   return Number.isFinite(value) && value >= 1e3 && value <= 12e4 ? value : CONFIG_LOCK_DEFAULT_TIMEOUT_MS;
 }
-function boundedOAuth(serviceUrls) {
+function boundedOAuth(serviceUrls, environment) {
   const fetchImpl = (input2, init) => globalThis.fetch(input2, {
     ...init,
     // Never re-POST a refresh token, device code or revoked token to another origin.
     redirect: "error",
     signal: init?.signal ?? AbortSignal.timeout(AUTH_EXCHANGE_TIMEOUT_MS)
   });
-  return new TopoloOAuth2({ serviceUrls, fetch: fetchImpl });
+  return new TopoloOAuth2({ serviceUrls, fetch: fetchImpl, environment });
 }
 var CONFIG_LOCK_DEAD_OWNER_MIN_AGE_MS = 2e3;
 var ConfigOwnershipError = class extends TopoloSdkError2 {
@@ -5827,7 +6351,7 @@ async function renewTarget(environment, target, options) {
         return endGrant(retired.reason === "rotated" ? "rotated_grant_lost" : retired.reason);
       }
       const serviceUrls = authServiceUrls(profile, environment, target.kind === "active" ? "credential refresh" : "context refresh");
-      const oauth = boundedOAuth(serviceUrls);
+      const oauth = boundedOAuth(serviceUrls, environment);
       try {
         await persist((current) => {
           const next = clone(current);
@@ -5922,7 +6446,7 @@ async function continueReauthorization(environment, key) {
     const clientId = (key === DEFAULT_SLOT ? void 0 : profile.contexts?.[key]?.oauthClientId) ?? profile.oauthClientId;
     if (!clientId) throw reauthRequired(environment, key, entry, "unavailable");
     const serviceUrls = authServiceUrls(profile, environment, "sign-in renewal");
-    const oauth = boundedOAuth(serviceUrls);
+    const oauth = boundedOAuth(serviceUrls, environment);
     const now = nowSeconds();
     let state = clone(entry);
     const save = async (update) => {
@@ -6601,6 +7125,7 @@ async function runDeviceFlow(options) {
   const config = await readConfig();
   const resolved = resolvedProfileConfig(config, options.environment);
   const oauth = new TopoloOAuth({
+    environment: options.environment,
     serviceUrls: resolved.serviceUrls
   });
   const start = await oauth.requestDeviceCode({
@@ -10130,8 +10655,9 @@ function errorMessage(error) {
 }
 
 // src/commands/context.ts
-function makeClient(credential, serviceUrls) {
+function makeClient(environment, credential, serviceUrls) {
   return createTopolo({
+    environment,
     credential,
     agent: { clientName: "topolo-cli", clientVersion: CLI_VERSION },
     serviceUrls
@@ -10141,8 +10667,8 @@ function unwrap(res) {
   const r = res ?? {};
   return r.data ?? r;
 }
-async function fetchMe(credential, serviceUrls) {
-  const topolo = makeClient(credential, serviceUrls);
+async function fetchMe(environment, credential, serviceUrls) {
+  const topolo = makeClient(environment, credential, serviceUrls);
   const data = unwrap(await topolo.client.request({ service: "auth", method: "GET", path: "/api/auth/me" }));
   const user = data.user ?? {};
   const rawMemberships = user.organizationMemberships || data.organizations || [];
@@ -10169,8 +10695,8 @@ function credentialFromTokens(tokens) {
     ...expiresAt ? { expiresAt } : {}
   };
 }
-async function exchangeForContext(credential, serviceUrls, target) {
-  const topolo = makeClient(credential, serviceUrls);
+async function exchangeForContext(environment, credential, serviceUrls, target) {
+  const topolo = makeClient(environment, credential, serviceUrls);
   const data = unwrap(
     await topolo.client.request({
       service: "auth",
@@ -10229,7 +10755,7 @@ function registerContextCommand(program2) {
       let activeIdentity = null;
       if (cred) {
         try {
-          activeIdentity = await fetchMe(cred, serviceUrls);
+          activeIdentity = await fetchMe(environment, cred, serviceUrls);
         } catch {
           activeIdentity = null;
         }
@@ -10238,7 +10764,7 @@ function registerContextCommand(program2) {
         try {
           const contextCredential = key === activeKey ? cred : await refreshContextCredentialIfNeeded(environment, key);
           if (!contextCredential) return;
-          const identity = key === activeKey && activeIdentity ? activeIdentity : await fetchMe(contextCredential, serviceUrls);
+          const identity = key === activeKey && activeIdentity ? activeIdentity : await fetchMe(environment, contextCredential, serviceUrls);
           if (!identityMatchesContext(identity, ctx)) return;
           const row = rows.get(key) ?? {
             key,
@@ -10334,7 +10860,7 @@ function registerContextCommand(program2) {
       } else if (wantPersonal) {
         resolved = { contextType: "personal" };
       } else {
-        const me = await fetchMe(cred, serviceUrls);
+        const me = await fetchMe(environment, cred, serviceUrls);
         const match = me.memberships.find(
           (m) => m.id === target || m.slug?.toLowerCase() === needle || m.name?.toLowerCase() === needle
         );
@@ -10359,7 +10885,7 @@ function registerContextCommand(program2) {
         const storedCredential = await refreshContextCredentialIfNeeded(environment, key);
         if (storedCredential) {
           try {
-            const storedIdentity = await fetchMe(storedCredential, serviceUrls);
+            const storedIdentity = await fetchMe(environment, storedCredential, serviceUrls);
             if (identityMatchesContext(storedIdentity, resolved)) {
               newCredential = storedCredential;
             }
@@ -10369,13 +10895,13 @@ function registerContextCommand(program2) {
       }
       if (!newCredential) {
         if (resolved.contextType === "personal") {
-          const identity = await fetchMe(cred, serviceUrls);
+          const identity = await fetchMe(environment, cred, serviceUrls);
           if (!identity.personalAvailable) {
             throw new Error("Personal context is not available for this account.");
           }
         }
         try {
-          newCredential = await exchangeForContext(cred, serviceUrls, {
+          newCredential = await exchangeForContext(environment, cred, serviceUrls, {
             type: resolved.contextType,
             id: resolved.organizationId
           });
@@ -10388,7 +10914,7 @@ function registerContextCommand(program2) {
             );
           }
           cred = refreshed;
-          newCredential = await exchangeForContext(cred, serviceUrls, {
+          newCredential = await exchangeForContext(environment, cred, serviceUrls, {
             type: resolved.contextType,
             id: resolved.organizationId
           });

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@topolo/cli",
   "packageManager": "pnpm@10.17.1",
-  "version": "0.13.24",
-  "topoloPublishedVersion": "0.13.24",
+  "version": "0.13.26",
+  "topoloPublishedVersion": "0.13.26",
   "description": "Public command-line interface for Topolo customer organizations, developers, and agents.",
   "license": "UNLICENSED",
   "author": "Topolo",
@@ -33,8 +33,8 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "1.31.0",
-    "@topolo/mcp": "0.14.37",
-    "@topolo/sdk": "0.23.26",
+    "@topolo/mcp": "0.14.38",
+    "@topolo/sdk": "0.24.0",
     "commander": "^12.1.0",
     "undici": "6.29.0"
   },