@everystack/cli 0.4.88 → 0.4.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everystack/cli",
-  "version": "0.4.88",
+  "version": "0.4.89",
   "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/db-reconcile.ts

@@ -61,6 +61,7 @@ import { invokeAction, lambdaQueryRunner, lambdaSessionRunner } from '../aws';
 import { modelContractPreflight } from '../model-wire-lane';
 import { MODEL_WIRE_CONTRACT, type ReconcileWirePayload } from '../../wire';
 import { step, success, fail, info, warn } from '../output';
+import { splitIdentityList } from '../utils/identity-list';
 
 // ---------------------------------------------------------------------------
 // The testable core.
@@ -622,7 +623,7 @@ export async function dbReconcileCommand(flags: Record<string, string>): Promise
 
   // --only <a,b>: restrict the reconcile to the named identities (surgical). With --rebuild it is
   // the recovery path for a self-consistent-but-wrong provenance row (a mistaken --rebaseline).
-  const only = flags.only ? flags.only.split(',').map((s) => s.trim()).filter(Boolean) : undefined;
+  const only = flags.only ? splitIdentityList(flags.only) : undefined;
   // An empty/whitespace --only would silently degrade to a FULL reconcile — refuse it, since the
   // operator clearly meant to scope the run.
   if (flags.only !== undefined && !only?.length) {

package/src/cli/commands/db-refresh.ts

@@ -30,6 +30,7 @@ import { resolveConfig, opsFunction } from '../config';
 import { resolveOperatorUrlViaStage } from '../direct-venue';
 import { invokeAction } from '../aws';
 import { step, success, fail, info } from '../output';
+import { splitIdentityList } from '../utils/identity-list';
 
 export async function dbRefreshCommand(flags: Record<string, string>): Promise<void> {
   // The declared matviews, in dependency order (a dependent matview reads its parents' fresh rows).
@@ -40,7 +41,7 @@ export async function dbRefreshCommand(flags: Record<string, string>): Promise<v
     fail(err.message);
     process.exit(1);
   }
-  const only = flags.only ? flags.only.split(',').map((s) => s.trim()).filter(Boolean) : undefined;
+  const only = flags.only ? splitIdentityList(flags.only) : undefined;
   // --verify-nonempty: after refreshing, gate on populated-but-zero-rows matviews (the dark-panel
   // check) — credential-free, a scoped EXISTS on only what was just refreshed.
   const verifyNonempty = flags['verify-nonempty'] === 'true';

package/src/cli/commands/db.ts

@@ -5,7 +5,7 @@
  * No HTTP endpoints, no shared secrets — IAM is the authorization layer.
  */
 
-import { resolveConfig, opsFunction } from '../config';
+import { resolveConfig, opsFunction, probeUrl, type CliConfig } from '../config';
 import { invokeAction } from '../aws';
 import { step, success, fail, info, warn } from '../output';
 import { opsAdviceLines, IAM_ADVICE } from '../ops-advice';
@@ -613,6 +613,29 @@ export function parseUrlConnection(url: string): { host: string; port: string; d
   };
 }
 
+/**
+ * Rotation's non-blocking origin check. probeUrl falls back to siteUrl when there is no
+ * CDN_URL, so a stage without one still gets checked here instead of silently skipping the
+ * check (reading config.baseUrl directly did that). Exported for testing without invoking the
+ * whole rotation flow.
+ */
+export async function probeRotationOrigin(
+  config: Pick<CliConfig, 'baseUrl' | 'siteUrl'>,
+  fetchImpl: typeof fetch = fetch,
+): Promise<{ ok: boolean; message: string } | undefined> {
+  const url = probeUrl(config);
+  if (!url) return undefined;
+  try {
+    const probe = `${url}?_probe=${Date.now()}`;
+    const res = await fetchImpl(probe, { redirect: 'follow' });
+    return res.ok
+      ? { ok: true, message: 'Origin responding.' }
+      : { ok: false, message: `Origin returned ${res.status}.` };
+  } catch (err: any) {
+    return { ok: false, message: `Origin probe failed: ${err.message}` };
+  }
+}
+
 /**
  * db:provision --rotate — swap the active A/B role for one or both credential slots.
  *
@@ -812,15 +835,10 @@ async function rotateCredentials(flags: Record<string, string>): Promise<void> {
     }
 
     // Origin HTTP check (non-blocking — the login probe is the real gate).
-    if (config.baseUrl) {
-      try {
-        const probe = `${config.baseUrl}?_probe=${Date.now()}`;
-        const res = await fetch(probe, { redirect: 'follow' });
-        if (res.ok) success('Origin responding.');
-        else warn(`Origin returned ${res.status}.`);
-      } catch (err: any) {
-        warn(`Origin probe failed: ${err.message}`);
-      }
+    const originResult = await probeRotationOrigin(config);
+    if (originResult) {
+      if (originResult.ok) success(originResult.message);
+      else warn(originResult.message);
     }
 
     // Retire old roles and drain sessions — using the roles recorded at

package/src/cli/commands/update.ts

@@ -129,13 +129,16 @@ export async function updateCommand(flags: UpdateFlags & Record<string, string>)
       warn(`Could not load SST secrets: ${err.message}`);
       info('Secrets may be unavailable during export. Provide env vars from the caller if needed.');
     }
+  }
 
-    // After the secrets step: a secret may supply HOST_URL.
-    const noHostUrl = await missingHostUrlError(flags.stage, { siteUrl: resolvedConfig?.siteUrl });
-    if (noHostUrl) {
-      fail(noHostUrl);
-      process.exit(1);
-    }
+  // Runs whether or not --stage was given: the harm (baking the app's default URL into a
+  // published channel's bundle) is the same either way, and the documented day-to-day flow is
+  // `update --channel production` with no --stage at all. A secret loaded above may supply
+  // HOST_URL, which is why this runs after that step rather than before it.
+  const noHostUrl = await missingHostUrlError(flags.stage, { siteUrl: resolvedConfig?.siteUrl });
+  if (noHostUrl) {
+    fail(noHostUrl);
+    process.exit(1);
   }
 
   const branch = flags.branch;

package/src/cli/discover-distribution.ts

@@ -11,6 +11,8 @@
  *   3. Comment contains the {app}-{stage}- prefix (legacy setups; a substring, so a last resort)
  */
 
+import { warn } from './output';
+
 export interface DistributionHints {
   /** Host of the discovered router URL, e.g. d111abc.cloudfront.net or a custom domain. */
   routerHost?: string;
@@ -112,6 +114,7 @@ export async function discoverDistributionMatch(
   // Tag pass — authoritative, so it runs before the Comment guess (a Comment substring can name
   // another app's stage). One call per distribution; SST tags every distribution it makes.
   if (hints.appName && hints.stage) {
+    let warnedOnTagReadFailure = false;
     for (const dist of items) {
       if (!dist.ARN) continue;
       try {
@@ -123,7 +126,13 @@ export async function discoverDistributionMatch(
           return toMatch(dist, 'tag');
         }
       } catch {
-        // Tag read denied or transient — keep scanning
+        // Tag read denied or transient — keep scanning, but say so once. Silent here means
+        // siteUrl quietly degrades to empty and distributionId falls to the Comment guess,
+        // with nothing in the output naming why.
+        if (!warnedOnTagReadFailure) {
+          warnedOnTagReadFailure = true;
+          warn('cloudfront:ListTagsForResource failed during distribution discovery — falling back to Comment matching, which is a substring guess.');
+        }
       }
     }
   }

package/src/cli/discover.ts

@@ -79,11 +79,45 @@ export async function parseAppName(configPath?: string): Promise<string> {
   return match[1];
 }
 
+/**
+ * The prefix SST's `prefixName` produces for a resource named `resourceName` (e.g.
+ * "ApiFunction"), given the budget `physicalName(maxLen, name)` leaves after its trailing
+ * "-<8-char hash>" (maxLen - 9). Ports the SST platform's naming.ts prefixName exactly
+ * (see apps/example/.sst/platform/src/components/naming.ts): the STAGE is never truncated,
+ * the APP segment is cut to fit once app+stage+name would overflow the budget, and dropped
+ * entirely if even stage+name does.
+ * A naive "<app>-<stage>-<resourceName>" false-negatives on long app/stage names because it
+ * skips this truncation.
+ *
+ * `maxLen` is the physicalName length ceiling for the AWS resource TYPE being matched — it is
+ * NOT the same for every resource. SST's own naming table (component.ts namingRules) pins:
+ * Lambda functions and CloudFront functions at 64 (`aws:lambda/function:Function`,
+ * `aws:cloudfront/function:Function`), S3 buckets at 63 (`aws:s3/bucket:Bucket`, one character
+ * tighter). Reusing the Lambda budget for a bucket needle silently mis-truncates the app segment
+ * by one character once truncation actually kicks in.
+ */
+function sstPhysicalNamePrefix(
+  appName: string,
+  stage: string,
+  resourceName: string,
+  maxLen: number,
+): string {
+  const max = maxLen - 9;
+  const nameLen = resourceName.length;
+  const stageLen = stage.length;
+  if (nameLen + 1 >= max) return resourceName.substring(0, max);
+  if (nameLen + stageLen + 2 >= max) {
+    return `${stage.substring(0, max - nameLen - 1)}-${resourceName}`;
+  }
+  return `${appName.substring(0, max - stageLen - nameLen - 2)}-${stage}-${resourceName}`;
+}
+
 /**
  * Does a deploy-written .sst/outputs.json describe this stage? The file is the last deploy on ANY
  * stage and has no stage field, but its apiFunctionName is `<app>-<stage>-ApiFunction-<hash>`
- * (the convention discovery matches on). `.sst/stage` is NOT evidence: it is SST's personal-stage
- * marker and can name a different stage than the last deploy. Unknown means no.
+ * (the convention discovery matches on) — with the app segment possibly truncated by SST's
+ * prefixName (see sstPhysicalNamePrefix). `.sst/stage` is NOT evidence: it is SST's
+ * personal-stage marker and can name a different stage than the last deploy. Unknown means no.
  */
 export function outputsDescribeStage(
   outputs: { apiFunctionName?: string } | null | undefined,
@@ -92,7 +126,8 @@ export function outputsDescribeStage(
 ): boolean {
   const fn = outputs?.apiFunctionName;
   if (!fn) return false;
-  return fn.toLowerCase().startsWith(`${appName}-${stage}-ApiFunction-`.toLowerCase());
+  const prefix = sstPhysicalNamePrefix(appName, stage, 'ApiFunction', 64);
+  return fn.toLowerCase().startsWith(`${prefix}-`.toLowerCase());
 }
 
 // ---------------------------------------------------------------------------
@@ -110,7 +145,8 @@ interface CfFunctionResult {
  */
 export async function discoverCfFunction(
   region: string,
-  prefix: string,
+  appName: string,
+  stage: string,
 ): Promise<CfFunctionResult> {
   const {
     CloudFrontClient,
@@ -119,7 +155,9 @@ export async function discoverCfFunction(
   } = await import('@aws-sdk/client-cloudfront');
 
   const client = new CloudFrontClient({ region });
-  const needle = `${prefix}RouterCloudfrontFunctionRequest-`.toLowerCase();
+  // CloudFront functions share Lambda's 64-char physicalName ceiling (naming.ts namingRules).
+  const prefix = sstPhysicalNamePrefix(appName, stage, 'RouterCloudfrontFunctionRequest', 64);
+  const needle = `${prefix}-`.toLowerCase();
 
   let marker: string | undefined;
   let matchName: string | undefined;
@@ -142,7 +180,7 @@ export async function discoverCfFunction(
 
   if (!matchName) {
     throw new Error(
-      `No CloudFront function found matching "${prefix}RouterCloudfrontFunctionRequest-*". ` +
+      `No CloudFront function found matching "${prefix}-*". ` +
         `Check that the stage has been deployed.`,
     );
   }
@@ -168,12 +206,14 @@ interface LambdaResult {
 }
 
 /**
- * Find a Lambda function by SST resource name prefix.
+ * Find a Lambda function by SST resource name, truncating the app segment the way SST's
+ * physicalName does (see sstPhysicalNamePrefix) so a long app name still matches.
  * Returns the function name if found, undefined if not.
  */
 export async function discoverFunction(
   region: string,
-  prefix: string,
+  appName: string,
+  stage: string,
   resourceName: string,
 ): Promise<string | undefined> {
   const { LambdaClient, ListFunctionsCommand } = await importOptionalAws(
@@ -181,7 +221,7 @@ export async function discoverFunction(
   );
 
   const client = new LambdaClient({ region });
-  const needle = `${prefix}${resourceName}`.toLowerCase();
+  const needle = sstPhysicalNamePrefix(appName, stage, resourceName, 64).toLowerCase();
 
   let marker: string | undefined;
 
@@ -207,13 +247,15 @@ export async function discoverFunction(
  */
 export async function discoverLambda(
   region: string,
-  prefix: string,
+  appName: string,
+  stage: string,
 ): Promise<LambdaResult> {
-  const matchName = await discoverFunction(region, prefix, 'ApiFunction');
+  const matchName = await discoverFunction(region, appName, stage, 'ApiFunction');
 
   if (!matchName) {
+    const prefix = sstPhysicalNamePrefix(appName, stage, 'ApiFunction', 64);
     throw new Error(
-      `No API Lambda found for prefix "${prefix}ApiFunction-*". ` +
+      `No API Lambda found for prefix "${prefix}-*". ` +
         `Check that the stage has been deployed and you have lambda:ListFunctions permission.`,
     );
   }
@@ -251,7 +293,8 @@ interface BucketsResult {
  */
 export async function discoverBuckets(
   region: string,
-  prefix: string,
+  appName: string,
+  stage: string,
 ): Promise<BucketsResult> {
   const { S3Client, ListBucketsCommand } = await importOptionalAws(
     () => import('@aws-sdk/client-s3'), '@aws-sdk/client-s3', 'resource discovery',
@@ -261,15 +304,20 @@ export async function discoverBuckets(
   const res = await client.send(new ListBucketsCommand({}));
   const buckets = res.Buckets || [];
 
-  const updatesNeedle = `${prefix}updatesbucket-`.toLowerCase();
-  const clientNeedle = `${prefix}clientbundlesbucket-`.toLowerCase();
+  // S3 buckets physicalName-cap at 63 chars (naming.ts namingRules: "aws:s3/bucket:Bucket"),
+  // one tighter than Lambda/CloudFront functions' 64 — reusing the function budget here would
+  // mis-truncate the app segment by a character once truncation actually kicks in.
+  const bucketPrefix = (resourceName: string) =>
+    sstPhysicalNamePrefix(appName, stage, resourceName, 63);
+  const updatesNeedle = `${bucketPrefix('UpdatesBucket')}-`.toLowerCase();
+  const clientNeedle = `${bucketPrefix('ClientBundlesBucket')}-`.toLowerCase();
   // Media bucket resource is named 'Media' (not 'MediaBucket'), so match both patterns
-  const mediaNeedle = `${prefix}media-`.toLowerCase();
-  const mediaBucketNeedle = `${prefix}mediabucket-`.toLowerCase();
+  const mediaNeedle = `${bucketPrefix('Media')}-`.toLowerCase();
+  const mediaBucketNeedle = `${bucketPrefix('MediaBucket')}-`.toLowerCase();
   // Backups bucket (db:backup/restore/backup:download). Discovered like every other bucket, so the
   // --stage path carries it — db:backup:download presigns CLIENT-side and needs the name locally
   // (db:backup/backups run server-side in the ops Lambda, which is why only download failed).
-  const backupsNeedle = `${prefix}backupsbucket-`.toLowerCase();
+  const backupsNeedle = `${bucketPrefix('BackupsBucket')}-`.toLowerCase();
 
   let updatesBucket: string | undefined;
   let clientBundlesBucket: string | undefined;
@@ -301,17 +349,19 @@ export async function discoverConfig(
   stage: string,
   region: string,
 ): Promise<DiscoveredConfig> {
+  // Naive, untruncated — only for discoverDistributionMatch (Comment/tag matching, not the
+  // physicalName convention the other discover* calls below now truncate correctly for).
   const prefix = `${appName}-${stage}-`;
 
   // Run CF function + Lambda + S3 discovery in parallel
   const [cfResult, lambdaResult, bucketsResult, opsFn, imageFn, workerFn] = await Promise.all([
-    discoverCfFunction(region, prefix),
-    discoverLambda(region, prefix),
-    discoverBuckets(region, prefix),
-    discoverFunction(region, prefix, 'OpsFunction').catch(() => undefined),
-    discoverFunction(region, prefix, 'ImageFunction').catch(() => undefined),
-    discoverFunction(region, prefix, 'WorkerFunction')
-      .then(fn => fn || discoverFunction(region, prefix, 'JobsSubscriber'))
+    discoverCfFunction(region, appName, stage),
+    discoverLambda(region, appName, stage),
+    discoverBuckets(region, appName, stage),
+    discoverFunction(region, appName, stage, 'OpsFunction').catch(() => undefined),
+    discoverFunction(region, appName, stage, 'ImageFunction').catch(() => undefined),
+    discoverFunction(region, appName, stage, 'WorkerFunction')
+      .then(fn => fn || discoverFunction(region, appName, stage, 'JobsSubscriber'))
       .catch(() => undefined),
   ]);
 
@@ -359,15 +409,17 @@ export async function discoverConfig(
         : '';
 
   if (!bucketsResult.updatesBucket) {
+    const bucketPrefix = sstPhysicalNamePrefix(appName, stage, 'UpdatesBucket', 63);
     throw new Error(
-      `Could not find S3 bucket "${prefix}updatesbucket-*". ` +
+      `Could not find S3 bucket "${bucketPrefix}-*". ` +
         `Check that stage "${stage}" has been deployed and you have s3:ListAllMyBuckets permission.`,
     );
   }
 
   if (!bucketsResult.clientBundlesBucket) {
+    const bucketPrefix = sstPhysicalNamePrefix(appName, stage, 'ClientBundlesBucket', 63);
     throw new Error(
-      `Could not find S3 bucket "${prefix}clientbundlesbucket-*". ` +
+      `Could not find S3 bucket "${bucketPrefix}-*". ` +
         `Check that stage "${stage}" has been deployed.`,
     );
   }

package/src/cli/host-url.ts

@@ -106,17 +106,30 @@ async function dotenvSetsHostUrl(
 }
 
 /**
- * Why `update --stage` must stop: nothing supplied a HOST_URL, so the OTA bundle would bake the
- * app's default (often localhost) as updates.url. Devices could then never fetch the recovery
- * publish. Undefined when HOST_URL is set (env or dotenv) or no stage was given. The message
- * names the ways out, including the stage's own site URL when discovery found one.
+ * Why `update` must stop: nothing supplied a HOST_URL, so the OTA bundle would bake the app's
+ * default (often localhost) as updates.url. Devices could then never fetch the recovery publish.
+ * Undefined when HOST_URL is set (env or dotenv). Applies with OR without --stage — the
+ * documented day-to-day flow (getting-started.md) is `update --channel production` with no
+ * --stage at all, so a missing HOST_URL there is the SAME harm, not a smaller one: whatever
+ * bakes into that channel's bundle ships to real devices just the same. Without a stage there is
+ * no auto-discovery to fall back on (no --stage means no CDN_URL lookup, no site URL to offer),
+ * so the message says so plainly instead of naming a stage that was never given.
  */
 export async function missingHostUrlError(
   stage: string | undefined,
   opts: { env?: Record<string, string | undefined>; cwd?: string; siteUrl?: string; resolveFrom?: string } = {},
 ): Promise<string | undefined> {
   const { env = process.env, cwd = process.cwd(), siteUrl, resolveFrom = cwd } = opts;
-  if (!stage || env.HOST_URL || (await dotenvSetsHostUrl(cwd, env, resolveFrom))) return undefined;
+  if (env.HOST_URL || (await dotenvSetsHostUrl(cwd, env, resolveFrom))) return undefined;
+  if (!stage) {
+    return (
+      'No HOST_URL is set (env, dotenv, or a stage\'s .sst/outputs.json), so the bundle would ship ' +
+      'the app\'s default URL as updates.url. Export HOST_URL=<the public URL devices should fetch ' +
+      'updates from>, or re-run with --stage <stage> to discover it from the deployed API function\'s ' +
+      'CDN_URL. (A HOST_URL in a dotenv file counts only when the project\'s Expo can be found to ' +
+      'read it the way `expo export` does.)'
+    );
+  }
   const offer = siteUrl ? ` This stage's site URL is ${siteUrl}; export it as HOST_URL if that is its public URL.` : '';
   return (
     `No HOST_URL for stage "${stage}", so the bundle would ship the app's default URL as updates.url.${offer} ` +

package/src/cli/utils/identity-list.ts

@@ -0,0 +1,28 @@
+/**
+ * Splits a `--only a,b,c` flag value into identities.
+ *
+ * A naive `.split(',')` breaks a function identity like `auth.change_password(text,
+ * text)` into two garbage fragments — the argument list's own commas are not
+ * separators. This only treats a comma as a separator when it sits outside any
+ * parentheses, so `schema.fn(text, text)` survives as one identity.
+ */
+export function splitIdentityList(input: string): string[] {
+  const identities: string[] = [];
+  let depth = 0;
+  let current = '';
+
+  for (const ch of input) {
+    if (ch === '(') depth++;
+    else if (ch === ')') depth = Math.max(0, depth - 1);
+
+    if (ch === ',' && depth === 0) {
+      identities.push(current.trim());
+      current = '';
+      continue;
+    }
+    current += ch;
+  }
+  identities.push(current.trim());
+
+  return identities.filter(Boolean);
+}