@everystack/cli 0.4.87 → 0.4.88

package/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to `@everystack/cli` are documented here.
 
 Format based on [Keep a Changelog](https://keepachangelog.com/).
 
+## [0.4.88] - 2026-09-21
+
+### Fixed
+
+- cache:purge probes a site's own hostname, and takes --host
+
 ## [0.4.87] - 2026-09-21
 
 ### BREAKING CHANGES

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everystack/cli",
-  "version": "0.4.87",
+  "version": "0.4.88",
   "description": "CLI and OTA updates for Expo apps on everystack",
   "license": "AGPL-3.0-only",
   "author": "Scalable Technology, Inc. <licensing@scalable.technology>",

package/src/cli/commands/audit.ts

@@ -8,7 +8,7 @@
  * the heavier `audit:lighthouse` stay separate commands (run them explicitly).
  */
 
-import { resolveConfig, opsFunction, probeUrl } from '../config';
+import { resolveConfig, opsFunction, probeUrl, ambiguousSiteNote } from '../config';
 import { runBundleAudit, runBundleWeightAudit, reportBundleAudit } from './bundle';
 import { runUiAudit, reportUiAudit } from './ui-audit';
 import { checkRunbook } from './runbook';
@@ -33,6 +33,8 @@ export async function auditCommand(flags: Record<string, string>): Promise<void>
     fail('No router URL to audit. Pass --host or ensure the stage has a deployed URL.');
     process.exit(1);
   }
+  const ambiguous = flags.host ? undefined : ambiguousSiteNote(config);
+  if (ambiguous) info(ambiguous);
   info(`Region: ${config.region}, URL: ${base}`);
 
   let failures = 0;

package/src/cli/commands/bundle.ts

@@ -48,7 +48,7 @@ import {
   DEFAULT_UI_BLOAT_BUDGET,
   type UiBloatBudget,
 } from '../ui-bloat';
-import { resolveConfig, probeUrl } from '../config';
+import { resolveConfig, probeUrl, ambiguousSiteNote } from '../config';
 import { fail, info, step, success, warn } from '../output';
 
 // Expo Router web export puts client chunks under client/_expo/...; a plain
@@ -430,7 +430,10 @@ export async function bundleAuditCommand(
   let target = positional || flags.url;
   if (!target) {
     try {
-      target = probeUrl(await resolveConfig(flags.stage));
+      const stageConfig = await resolveConfig(flags.stage);
+      target = probeUrl(stageConfig);
+      const ambiguous = ambiguousSiteNote(stageConfig);
+      if (ambiguous) info(ambiguous);
     } catch (err: any) {
       fail(err.message);
       info('Pass a URL positionally or use --stage <name>.');

package/src/cli/commands/cache.ts

@@ -13,6 +13,9 @@ import { resolveConfig, probeUrl } from '../config';
 import { putKvsKey, createInvalidation, getDistributionStatus, getFromS3 } from '../aws';
 import { step, success, warn, fail, info } from '../output';
 
+/** One black-holed candidate must not stall the gate for the OS connect timeout. */
+const PROBE_TIMEOUT_MS = 10_000;
+
 const VALID_ORIGINS = ['api', 'media', 'web'] as const;
 type CacheOrigin = typeof VALID_ORIGINS[number];
 
@@ -34,10 +37,28 @@ export async function cachePurgeCommand(flags: Record<string, string>): Promise<
 
   const force = flags.force === 'true';
 
+  // What the gate probes: --host wins, else every discovered candidate (aliases before the domain).
+  let candidates: string[];
+  if (flags.host !== undefined) {
+    // parseFlags gives a value-less --host the string 'true'; '' is --host= . Neither is a host.
+    const host = flags.host === 'true' || flags.host === '' ? undefined : normalizeHost(flags.host);
+    if (!host) {
+      fail(`--host "${flags.host}" is not a hostname or URL.`);
+      info('Pass the site\'s public address, for example --host https://www.example.com');
+      process.exit(1);
+    }
+    if (host.startsWith('http://')) {
+      warn('--host is plaintext http://: anyone on the path can forge the release header and pass the gate.');
+    }
+    candidates = [host];
+  } else {
+    candidates = config.siteUrls?.length ? config.siteUrls : [probeUrl(config)].filter(Boolean);
+  }
+
   // Safety gate: verify the origin is serving the expected release and the distribution is stable.
   if (!force) {
     const channel = flags.channel || flags.stage || 'production';
-    const blocked = await preflight(config.region, probeUrl(config), config.updatesBucket, channel, config.distributionId);
+    const blocked = await preflight(config.region, candidates, config.updatesBucket, channel, config.distributionId);
     if (blocked) {
       fail(blocked);
       info('Pass --force to override this check.');
@@ -105,13 +126,24 @@ export async function cachePurgeCommand(flags: Record<string, string>): Promise<
   }
 }
 
+/** `www.example.com` or `https://www.example.com/` to `https://www.example.com`; undefined if it is not a host. */
+function normalizeHost(value: string): string | undefined {
+  const withScheme = /^https?:\/\//i.test(value) ? value : `https://${value}`;
+  try {
+    const u = new URL(withScheme);
+    return u.host && !/\s/.test(value) ? `${u.protocol}//${u.host}` : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
 /**
  * Pre-purge safety checks. Returns an error message if blocked, null if clear.
  * @internal Exported for testing.
  */
 export async function preflight(
   region: string,
-  siteUrl: string,
+  siteUrl: string | readonly string[],
   updatesBucket: string,
   channel: string,
   distributionId?: string,
@@ -133,27 +165,55 @@ export async function preflight(
     return `Channel manifest for "${channel}" has no updateId.`;
   }
 
-  // 2. Probe the origin for the serving release.
-  if (!siteUrl) {
+  // 2. Probe for the serving release. The gate passes when ANY candidate serves the expected
+  // release: a CloudFront Function can gate by Host, so the raw cloudfront.net address may answer
+  // 403 while the site's own hostname answers 200 with x-everystack-release.
+  const urls = (typeof siteUrl === 'string' ? [siteUrl] : [...siteUrl]).filter(Boolean);
+  if (urls.length === 0) {
     return (
       'No site URL for this stage, so the origin cannot be probed. ' +
-      'Set CDN_URL on the API function and redeploy, or tag the distribution sst:app/sst:stage; ' +
-      'then re-run with --refresh to discover the stage again. Or pass --force to skip this check.'
+      'Pass --host <the site\'s public URL>, set CDN_URL on the API function and redeploy, or tag the distribution sst:app/sst:stage ' +
+      'and re-run with --refresh. Or pass --force to skip this check.'
     );
   }
-  try {
-    const probe = `${siteUrl}?_probe=${Date.now()}`;
-    const res = await fetch(probe, { redirect: 'follow' });
-    const serving = res.headers.get('x-everystack-release');
-    if (serving !== expectedUpdateId) {
+  const outcomes: Array<{ url: string; serving?: string | null; status?: number; error?: string }> = [];
+  let served = false;
+  for (const url of urls) {
+    try {
+      const res = await fetch(`${url}?_probe=${Date.now()}`, { redirect: 'follow', signal: AbortSignal.timeout(PROBE_TIMEOUT_MS) });
+      const serving = res.headers.get('x-everystack-release');
+      if (serving === expectedUpdateId) {
+        served = true;
+        break;
+      }
+      outcomes.push({ url, serving, status: res.status });
+    } catch (err: any) {
+      outcomes.push({ url, error: err.message });
+    }
+  }
+  if (!served) {
+    const want = expectedUpdateId.slice(0, 12);
+    const stale = 'Purging now would expose stale containers to uncached traffic.';
+    if (outcomes.length === 1) {
+      const o = outcomes[0];
+      if (o.error !== undefined) return `Could not reach origin at ${o.url}: ${o.error}`;
       return (
-        `Origin is serving release ${serving ? serving.slice(0, 12) + '...' : '(none)'} ` +
-        `but the channel pointer is ${expectedUpdateId.slice(0, 12)}.... Probed ${siteUrl}. ` +
-        `Purging now would expose stale containers to uncached traffic.`
+        `Origin is serving release ${o.serving ? o.serving.slice(0, 12) + '...' : '(none)'} ` +
+        `but the channel pointer is ${want}.... Probed ${o.url}. ${stale}` +
+        (o.serving ? '' : " If the site's public hostname differs, pass --host <url>.")
       );
     }
-  } catch (err: any) {
-    return `Could not reach origin at ${siteUrl}: ${err.message}`;
+    const tried = outcomes
+      .map((o) =>
+        o.error !== undefined
+          ? `${o.url} (unreachable: ${o.error})`
+          : `${o.url} (${o.serving ? 'release ' + o.serving.slice(0, 12) + '...' : `HTTP ${o.status}, no x-everystack-release header`})`,
+      )
+      .join(', ');
+    return (
+      `No probed URL serves release ${want}...: ${tried}. ${stale} ` +
+      "If the site's public hostname is not listed, pass --host <url>."
+    );
   }
 
   // 3. Check distribution status (if discoverable).

package/src/cli/commands/diag.ts

@@ -13,7 +13,7 @@
  *   everystack diag [url] --hydration  # Analyze SSR hydration issues
  */
 
-import { resolveConfig, probeUrl } from '../config';
+import { resolveConfig, probeUrl, ambiguousSiteNote } from '../config';
 import { getFromS3 } from '../aws';
 import { step, success, fail, info, warn } from '../output';
 import { analyzeHtml, generateHydrationReport } from '../hydration-analyzer';
@@ -54,6 +54,8 @@ export async function diagCommand(
   let url = positionalUrl;
   if (!url) {
     url = probeUrl(config);
+    const ambiguous = ambiguousSiteNote(config);
+    if (ambiguous) info(ambiguous);
     if (!url) {
       fail('No URL provided and no site URL for this stage. Pass a URL, set CDN_URL on the API function, or use --stage on a deployed stage.');
       process.exit(1);

package/src/cli/commands/lighthouse.ts

@@ -21,7 +21,7 @@ import {
   type ExtractedRun,
   type LhReport,
 } from '../lighthouse';
-import { resolveConfig, probeUrl } from '../config';
+import { resolveConfig, probeUrl, ambiguousSiteNote } from '../config';
 import { step, info, fail, warn } from '../output';
 
 function runLighthouse(url: string, outPath: string): LhReport {
@@ -70,6 +70,8 @@ export async function auditLighthouseCommand(flags: Record<string, string>): Pro
     try {
       const config = await resolveConfig(flags.stage);
       host = probeUrl(config);
+      const ambiguous = ambiguousSiteNote(config);
+      if (ambiguous) info(ambiguous);
     } catch (err: any) {
       fail(err.message);
       info('Pass --host <url> to audit a specific URL without resolving a stage.');

package/src/cli/commands/security-probe.ts

@@ -26,7 +26,7 @@ import {
   type CatalogGrant,
   type ProbeResult,
 } from '../security-probe';
-import { resolveConfig, opsFunction, probeUrl } from '../config';
+import { resolveConfig, opsFunction, probeUrl, ambiguousSiteNote } from '../config';
 import { invokeAction } from '../aws';
 import { step, info, fail, success, warn } from '../output';
 
@@ -193,6 +193,8 @@ export async function securityProbeCommand(flags: Record<string, string>): Promi
     fail('No router URL to probe. Pass --host or ensure the stage has a deployed URL.');
     process.exit(1);
   }
+  const ambiguous = flags.host ? undefined : ambiguousSiteNote(config);
+  if (ambiguous) info(ambiguous);
   info(`Region: ${config.region}, Function: ${opsFunction(config)}, URL: ${base}`);
 
   let results: ProbeResult[];

package/src/cli/config.ts

@@ -16,6 +16,10 @@ export interface CliConfig {
   baseUrl: string;
   /** What cache:purge and update's release check probe. Falls back to baseUrl when absent. */
   siteUrl?: string;
+  /** Candidate URLs to probe, best first (see DiscoveredConfig.siteUrls). Absent on older configs. */
+  siteUrls?: string[];
+  /** The stage distribution's concrete aliases (empty when CDN_URL is set). */
+  siteAliases?: string[];
   region: string;
   apiFunctionName: string;
   /** Dedicated operator function (db/console actions). Falls back to apiFunctionName. */
@@ -41,6 +45,20 @@ export function probeUrl(config: Pick<CliConfig, 'baseUrl' | 'siteUrl'>): string
   return config.siteUrl || config.baseUrl || '';
 }
 
+/**
+ * One line for single-probe commands when the stage's distribution has several aliases and no
+ * CDN_URL: siteUrl is then the cloudfront.net domain, not a chosen host. A green there is a result
+ * for a host users may never hit, so say which one it is, every run. Undefined when unambiguous.
+ */
+export function ambiguousSiteNote(config: Pick<CliConfig, 'baseUrl' | 'siteUrl' | 'siteAliases'>): string | undefined {
+  const aliases = config.siteAliases ?? [];
+  if (config.baseUrl || aliases.length < 2) return undefined;
+  return (
+    `Site URL is ambiguous: this stage's distribution has aliases ${aliases.join(', ')}. Probing ${probeUrl(config)}. ` +
+    'Choose one with --host <alias> (or pass the URL to diag and bundle:audit).'
+  );
+}
+
 /** Operator invoke target — dedicated ops function when deployed, else the API function. */
 export function opsFunction(config: CliConfig): string {
   return config.opsFunctionName ?? config.apiFunctionName;
@@ -168,6 +186,7 @@ export async function resolveConfig(stage?: string): Promise<CliConfig> {
   return {
     baseUrl: outputs.routerUrl,
     siteUrl: outputs.routerUrl,
+    siteUrls: [outputs.routerUrl],
     region,
     apiFunctionName: outputs.apiFunctionName,
     opsFunctionName: outputs.opsFunctionName,

package/src/cli/discover-distribution.ts

@@ -33,13 +33,16 @@ interface DistributionSummaryLite {
  */
 export interface DistributionMatch {
   id: string;
-  /** cloudfront.net domain, no scheme — the host this distribution always answers on. */
+  /** cloudfront.net domain, no scheme. A CloudFront Function may still answer 403 on it. */
   domain?: string;
+  /** Concrete custom-domain aliases (wildcards dropped), in CloudFront's order: the site's real hostnames. */
+  aliases: string[];
   by: 'host' | 'comment' | 'tag';
 }
 
 function toMatch(dist: DistributionSummaryLite, by: DistributionMatch['by']): DistributionMatch | undefined {
-  return dist.Id ? { id: dist.Id, domain: dist.DomainName, by } : undefined;
+  const aliases = (dist.Aliases?.Items ?? []).filter((a) => !a.includes('*'));
+  return dist.Id ? { id: dist.Id, domain: dist.DomainName, aliases, by } : undefined;
 }
 
 function matchByHost(items: readonly DistributionSummaryLite[], routerHost?: string): DistributionMatch | undefined {

package/src/cli/discover.ts

@@ -27,6 +27,14 @@ interface DiscoveredConfig {
    * tag-confirmed CloudFront distribution, else ''. Probe-only; never shipped.
    */
   siteUrl: string;
+  /**
+   * Every URL worth probing, best first: CDN_URL alone when set, else the distribution's custom
+   * aliases then its cloudfront.net domain. A CloudFront Function can gate by Host and answer 403 on
+   * the raw domain, so the gate passes if ANY of these serves the release. siteUrl is the first.
+   */
+  siteUrls: string[];
+  /** The distribution's concrete aliases; two or more make siteUrl a guess, which commands announce. */
+  siteAliases: string[];
   region: string;
   apiFunctionName: string;
   opsFunctionName?: string;
@@ -309,6 +317,8 @@ export async function discoverConfig(
 
   // Distribution discovery is best-effort (status CDN section, cache:purge --invalidate)
   let distributionId: string | undefined;
+  let distributionHosts: string[] = [];
+  let distributionAliases: string[] = [];
   let distributionDomain: string | undefined;
   try {
     const { discoverDistributionMatch } = await import('./discover-distribution');
@@ -323,7 +333,11 @@ export async function discoverConfig(
     distributionId = match?.id;
     // A Comment-substring match can name another app's stage; only a confirmed one may say
     // which site a purge probes.
-    if (match && match.by !== 'comment') distributionDomain = match.domain;
+    if (match && match.by !== 'comment') {
+      distributionAliases = match.aliases;
+      distributionDomain = match.domain;
+      distributionHosts = [...match.aliases, ...(match.domain ? [match.domain] : [])];
+    }
   } catch {
     // Non-fatal
   }
@@ -331,7 +345,18 @@ export async function discoverConfig(
   // CDN_URL is optional on the API Lambda. Without it the stage's own distribution supplies the
   // probe URL — and only that: baseUrl stays as deployed (see DiscoveredConfig).
   const baseUrl = lambdaResult.routerUrl || '';
-  const siteUrl = baseUrl || (distributionDomain ? `https://${distributionDomain}` : '');
+  // Gate candidates: every host worth trying, best first. siteUrl is what single-probe commands use
+  // with no fallback, so it must not be a guess: CDN_URL, else the ONE alias if there is exactly one,
+  // else the cloudfront.net domain (loud on a hostname-gating site, and commands say which host).
+  const siteUrls = baseUrl ? [baseUrl] : distributionHosts.map((h) => `https://${h}`);
+  const siteAliases = baseUrl ? [] : distributionAliases;
+  const siteUrl = baseUrl
+    ? baseUrl
+    : distributionAliases.length === 1
+      ? `https://${distributionAliases[0]}`
+      : distributionDomain
+        ? `https://${distributionDomain}`
+        : '';
 
   if (!bucketsResult.updatesBucket) {
     throw new Error(
@@ -368,6 +393,8 @@ export async function discoverConfig(
   return {
     baseUrl,
     siteUrl,
+    siteUrls,
+    siteAliases,
     region,
     apiFunctionName: lambdaResult.functionName,
     opsFunctionName: opsFn,
@@ -387,13 +414,15 @@ export async function discoverConfig(
 // ---------------------------------------------------------------------------
 
 const CACHE_TTL_MS = 24 * 60 * 60 * 1000; // 24 hours
-const CACHE_VERSION = 6; // Bump when CachedOutputs schema changes to invalidate stale caches (5: +backupsBucket, 6: +siteUrl; getCachedConfig drops v5 files, an empty siteUrl is cached as a fact)
+const CACHE_VERSION = 7; // Bump when CachedOutputs schema changes to invalidate stale caches (5: +backupsBucket, 6: +siteUrl, 7: +siteUrls; v6 pinned the cloudfront.net domain, which a hostname-gating function answers 403)
 
 interface CachedOutputs {
   _cachedAt: number;
   _version?: number;
   routerUrl?: string;
   siteUrl?: string;
+  siteUrls?: string[];
+  siteAliases?: string[];
   apiFunctionName?: string;
   opsFunctionName?: string;
   imageFunctionName?: string;
@@ -422,6 +451,8 @@ export async function getCachedConfig(stage: string): Promise<DiscoveredConfig |
     return {
       baseUrl: cached.routerUrl || '',
       siteUrl: cached.siteUrl ?? cached.routerUrl ?? '',
+      siteUrls: cached.siteUrls ?? [],
+      siteAliases: cached.siteAliases ?? [],
       region: process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION || 'us-east-1',
       apiFunctionName: cached.apiFunctionName,
       opsFunctionName: cached.opsFunctionName,
@@ -500,6 +531,8 @@ export async function setCachedConfig(stage: string, config: DiscoveredConfig):
     _version: CACHE_VERSION,
     routerUrl: config.baseUrl,
     siteUrl: config.siteUrl,
+    siteUrls: config.siteUrls,
+    siteAliases: config.siteAliases,
     apiFunctionName: config.apiFunctionName,
     opsFunctionName: config.opsFunctionName,
     imageFunctionName: config.imageFunctionName,

package/src/cli/index.ts

@@ -367,6 +367,7 @@ Usage:
   everystack cache:purge       [--stage <name>] --origin api     Bust API origin cache (api|media|web)
   everystack cache:purge       [--stage <name>] --path "/api/posts"  Bust specific path cache
   everystack cache:purge       [--stage <name>] --invalidate     Also create CloudFront edge invalidation
+  everystack cache:purge       [--stage <name>] --host <url>     Probe this public URL for the release check (a site whose CloudFront Function gates by hostname)
   everystack diag              [url] [--path /about] [--channel <name>] [--stage <name>]  Diagnose page freshness
   everystack diag              [url] --hydration  Analyze SSR hydration issues (fetches full HTML)
   everystack analyze:ssr       [--app ./app]      Scan app code for SSR anti-patterns