@bigcommerce/catalyst 1.4.1 → 1.4.2

package/dist/cli.js

@@ -25,7 +25,7 @@ import { randomBytes, randomUUID } from "crypto";
 // package.json
 var package_default = {
   name: "@bigcommerce/catalyst",
-  version: "1.4.1",
+  version: "1.4.2",
   type: "module",
   repository: {
     type: "git",
@@ -619,6 +619,14 @@ function getProjectConfig(cwd = process.cwd()) {
         type: "object",
         additionalProperties: { type: "string" },
         default: {}
+      },
+      declinedSiteUrlChannels: {
+        type: "array",
+        items: { type: "number" }
+      },
+      declinedCheckoutUrlChannels: {
+        type: "array",
+        items: { type: "number" }
       }
     }
   });
@@ -1550,6 +1558,8 @@ async function buildCatalystProject(projectUuid, wranglerVersion = WRANGLER_VERS
     "pnpm",
     [
       "dlx",
+      "--allow-build=esbuild",
+      "--allow-build=workerd",
       `wrangler@${wranglerVersion}`,
       "deploy",
       "--config",
@@ -1617,12 +1627,17 @@ Examples:
 });
 
 // src/cli/commands/channels.ts
-import { confirm as confirm3, select as select4 } from "@inquirer/prompts";
+import { confirm as confirm4, select as select4 } from "@inquirer/prompts";
 import { Command as Command3, InvalidArgumentError as InvalidArgumentError2, Option as Option4 } from "commander";
 import { colorize as colorize5 } from "consola/utils";
 
+// src/cli/lib/can-prompt.ts
+function canPrompt() {
+  return Boolean(process.stdin.isTTY) && !process.env.CI;
+}
+
 // src/cli/lib/channel-checkout-url-flow.ts
-import { input as input3 } from "@inquirer/prompts";
+import { confirm as confirm3, input as input3 } from "@inquirer/prompts";
 
 // src/cli/lib/channel-site-flow.ts
 import { select as select2 } from "@inquirer/prompts";
@@ -1837,7 +1852,6 @@ async function deleteChannelCheckoutUrl(channelId, storeHash, accessToken, apiHo
 // src/cli/lib/checkout-url.ts
 import { getDomain } from "tldts";
 var normalizeHostname = (hostname) => hostname.toLowerCase().replace(/\.$/, "");
-var parentDomain = (hostname) => hostname.split(".").slice(1).join(".");
 var isSubdomainOf = (hostname, parent) => hostname.endsWith(`.${parent}`);
 function hostnameOf(url) {
   try {
@@ -1850,11 +1864,45 @@ function sharesMainDomain(a, b) {
   const first = getDomain(normalizeHostname(a));
   return first !== null && first === getDomain(normalizeHostname(b));
 }
-function suggestCheckoutUrl(storefrontUrl) {
+var MANAGED_ZONE_CHECKOUT_PREFIX = "c.";
+var MAX_HOSTNAME_LENGTH = 64;
+var CHECKOUT_HOSTNAME_READY_TIMEOUT_MS = 6 * 60 * 1e3;
+var CHECKOUT_HOSTNAME_POLL_INTERVAL_MS = 10 * 1e3;
+function managedCheckoutHostname(storefrontHostname) {
+  const hostname = MANAGED_ZONE_CHECKOUT_PREFIX + normalizeHostname(storefrontHostname);
+  return hostname.length <= MAX_HOSTNAME_LENGTH ? hostname : void 0;
+}
+async function checkoutHostnameIsServing(hostname) {
+  try {
+    await fetch(`https://${hostname}/`, {
+      method: "HEAD",
+      redirect: "manual",
+      signal: AbortSignal.timeout(1e4)
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function waitForCheckoutHostname(hostname, { timeoutMs = CHECKOUT_HOSTNAME_READY_TIMEOUT_MS, onWait } = {}) {
+  const deadline = Date.now() + timeoutMs;
+  let waited = false;
+  for (; ; ) {
+    if (await checkoutHostnameIsServing(hostname)) return true;
+    if (Date.now() + CHECKOUT_HOSTNAME_POLL_INTERVAL_MS >= deadline) return false;
+    if (!waited) {
+      waited = true;
+      onWait?.();
+    }
+    await new Promise((resolve2) => setTimeout(resolve2, CHECKOUT_HOSTNAME_POLL_INTERVAL_MS));
+  }
+}
+function suggestCheckoutUrl(storefrontUrl, { managedZone = false } = {}) {
   const host = hostnameOf(storefrontUrl);
   if (!host) return void 0;
-  const base = normalizeHostname(host).replace(/^www\./, "");
-  return `https://checkout.${base}`;
+  const normalized = normalizeHostname(host);
+  if (managedZone) return `https://${MANAGED_ZONE_CHECKOUT_PREFIX}${normalized}`;
+  return `https://checkout.${normalized.replace(/^www\./, "")}`;
 }
 function normalizeCheckoutUrl(value) {
   const withScheme = /^[a-z][a-z\d+.-]*:\/\//i.test(value) ? value : `https://${value}`;
@@ -1873,18 +1921,24 @@ function normalizeCheckoutUrl(value) {
   }
   return parsed.origin;
 }
-async function isManagedHostingHostname(hostname, context) {
-  try {
-    const projects2 = await fetchProjects(context.storeHash, context.accessToken, context.apiHost);
-    const zones = projects2.flatMap((project) => project.deployment_hostnames).map((deploymentHostname) => parentDomain(normalizeHostname(deploymentHostname))).filter((zone) => zone.includes("."));
-    if (zones.length === 0) return void 0;
-    const host = normalizeHostname(hostname);
-    return zones.some((zone) => host === zone || isSubdomainOf(host, zone));
-  } catch {
-    return void 0;
-  }
+var NATIVE_HOSTING_ZONES = [
+  "catalyst-sandbox.store",
+  "catalyst-sandbox-dev.store",
+  "catalyst-sandbox-staging.store",
+  "catalyst-sandbox-integration.store",
+  "ignition-demo.store"
+];
+function isManagedHostingHostname(hostname) {
+  const host = normalizeHostname(hostname);
+  return NATIVE_HOSTING_ZONES.some((zone) => isSubdomainOf(host, zone));
+}
+function isCrossDomainCheckout(site) {
+  const storefrontHost = hostnameOf(findChannelSiteUrl(site, "primary") ?? site.url);
+  const checkoutUrl = findChannelSiteUrl(site, "checkout");
+  const checkoutHost = checkoutUrl ? hostnameOf(checkoutUrl) : void 0;
+  return Boolean(storefrontHost && checkoutHost && !sharesMainDomain(storefrontHost, checkoutHost));
 }
-async function warnOnCrossDomainCheckout(site, context) {
+function warnOnCrossDomainCheckout(site) {
   const storefrontUrl = findChannelSiteUrl(site, "primary") ?? site.url;
   const storefrontHost = hostnameOf(storefrontUrl);
   const checkoutUrl = findChannelSiteUrl(site, "checkout");
@@ -1906,22 +1960,23 @@ async function warnOnCrossDomainCheckout(site, context) {
   consola.info(
     "Shopper sessions and carts may not carry into checkout in browsers that restrict cross-domain cookies."
   );
-  const storefrontOnManagedZone = await isManagedHostingHostname(storefrontHost, context);
-  const report = { crossDomain: true, storefrontOnManagedZone, suggestion };
-  if (storefrontOnManagedZone === false) {
+  const storefrontOnManagedZone = isManagedHostingHostname(storefrontHost);
+  const report = {
+    crossDomain: true,
+    storefrontOnManagedZone,
+    suggestion: storefrontOnManagedZone ? suggestCheckoutUrl(storefrontUrl, { managedZone: true }) : suggestion
+  };
+  if (storefrontOnManagedZone) {
     consola.info(
-      `To put checkout on this channel's own domain, point ${suggestion?.replace("https://", "") ?? "your checkout subdomain"} at BigCommerce and provision a certificate for it there.`
+      `${storefrontHost} is an auto-generated deployment hostname, so its checkout hostname is ${MANAGED_ZONE_CHECKOUT_PREFIX}${storefrontHost}. BigCommerce provisions it when it's set as the checkout URL, and its certificate takes a few minutes to issue. Set it with:`
     );
-    return report;
-  }
-  if (storefrontOnManagedZone === true) {
-    consola.info(
-      `${storefrontHost} is an auto-generated deployment hostname, and a checkout subdomain of one cannot be issued a certificate \u2014 so no checkout URL can be set for this channel until its storefront is on a custom domain. Add one with \`catalyst domains add\`.`
+    consola.log(
+      `  catalyst channels update --channel-id ${site.channelId} --checkout-url ${report.suggestion ?? "<domain>"}`
     );
     return report;
   }
   consola.info(
-    "BigCommerce requires the checkout URL to share a main domain with the storefront. Set one with `catalyst channels update --checkout-url <domain>` once it points at BigCommerce."
+    `To put checkout on this channel's own domain, point ${suggestion?.replace("https://", "") ?? "your checkout subdomain"} at BigCommerce and provision a certificate for it there.`
   );
   return report;
 }
@@ -1995,15 +2050,26 @@ async function runChannelSiteUrlFlow(options) {
   const channel = await resolveChannel(options);
   const hostname = await resolveHostname(project, options);
   const siteUrl = hostname.startsWith("https://") ? hostname : `https://${hostname}`;
-  await updateChannelSiteUrl(
+  const channelLabel = channel.name ? `"${channel.name}" (${channel.id})` : String(channel.id);
+  const current = await getChannelSite(
     channel.id,
-    siteUrl,
     options.storeHash,
     options.accessToken,
     options.apiHost
-  );
-  const channelLabel = channel.name ? `"${channel.name}" (${channel.id})` : String(channel.id);
-  consola.success(`Updated channel ${channelLabel} site URL to ${siteUrl}.`);
+  ).catch(() => void 0);
+  if (current && (findChannelSiteUrl(current, "primary") ?? current.url).replace(/\/$/, "") === siteUrl) {
+    consola.info(`Channel ${channelLabel} site URL is already ${siteUrl}.`);
+  } else {
+    await updateChannelSiteUrl(
+      channel.id,
+      siteUrl,
+      options.storeHash,
+      options.accessToken,
+      options.apiHost
+    );
+    consola.success(`Updated channel ${channelLabel} site URL to ${siteUrl}.`);
+  }
+  if (options.diagnoseCheckout === false) return { channelId: channel.id, hostname };
   try {
     const site = await getChannelSite(
       channel.id,
@@ -2011,11 +2077,7 @@ async function runChannelSiteUrlFlow(options) {
       options.accessToken,
       options.apiHost
     );
-    const report = await warnOnCrossDomainCheckout(site, {
-      storeHash: options.storeHash,
-      accessToken: options.accessToken,
-      apiHost: options.apiHost
-    });
+    const report = warnOnCrossDomainCheckout(site);
     if (report.crossDomain && report.storefrontOnManagedZone !== true) {
       consola.info("Set a checkout URL for this channel with:");
       consola.log(
@@ -2024,13 +2086,22 @@ async function runChannelSiteUrlFlow(options) {
     }
   } catch {
   }
-  return { channelId: channel.id };
+  return { channelId: channel.id, hostname };
 }
 
 // src/cli/lib/channel-checkout-url-flow.ts
 async function runChannelCheckoutUrlFlow(options) {
   const channel = options.channelId !== void 0 ? { id: options.channelId, name: options.channelName } : await resolveChannel(options);
   const label = channel.name ? `"${channel.name}" (${channel.id})` : String(channel.id);
+  if (options.storefrontHostname !== void 0 && await setManagedCheckoutUrl({
+    ...options,
+    channelId: channel.id,
+    label,
+    storefrontHostname: options.storefrontHostname,
+    timeoutMs: options.certificateTimeoutMs
+  })) {
+    return;
+  }
   let storefrontUrl = options.storefrontUrl;
   if (!storefrontUrl) {
     const site = await getChannelSite(
@@ -2048,6 +2119,16 @@ async function runChannelCheckoutUrlFlow(options) {
       );
     }
   }
+  const storefrontHostname = hostnameOf(storefrontUrl);
+  if (options.url === void 0 && options.storefrontHostname === void 0 && storefrontHostname !== void 0 && await setManagedCheckoutUrl({
+    ...options,
+    channelId: channel.id,
+    label,
+    storefrontHostname,
+    timeoutMs: options.certificateTimeoutMs
+  })) {
+    return;
+  }
   const answer = options.url ?? await input3({
     message: "Checkout URL for this channel (must share a main domain with the storefront)",
     default: suggestCheckoutUrl(storefrontUrl)
@@ -2062,6 +2143,78 @@ async function runChannelCheckoutUrlFlow(options) {
   );
   consola.success(`Updated channel ${label} checkout URL to ${checkoutUrl}.`);
 }
+async function setManagedCheckoutUrl(options) {
+  const { storeHash, accessToken, apiHost, channelId, label, storefrontHostname } = options;
+  if (!isManagedHostingHostname(storefrontHostname)) return false;
+  const hostname = managedCheckoutHostname(storefrontHostname);
+  if (!hostname) {
+    consola.warn(
+      `${storefrontHostname} is too long to take a checkout prefix, so it has no checkout hostname. Checkout keeps its current URL.`
+    );
+    return true;
+  }
+  const checkoutUrl = `https://${hostname}`;
+  const site = await getChannelSite(channelId, storeHash, accessToken, apiHost);
+  if (site.isCheckoutUrlCustomized) {
+    const alreadySet = site.urls.some(
+      (entry) => entry.type === "checkout" && entry.url.replace(/\/$/, "") === checkoutUrl
+    );
+    if (!alreadySet) {
+      consola.info(
+        `Channel ${label} already has a custom checkout URL, so it was left alone. To replace it, run \`catalyst channels update --channel-id ${channelId} --checkout-url ${checkoutUrl}\`.`
+      );
+      return true;
+    }
+  } else {
+    await updateChannelCheckoutUrl(channelId, checkoutUrl, storeHash, accessToken, apiHost);
+    consola.success(`Updated channel ${label} checkout URL to ${checkoutUrl}.`);
+  }
+  const ready = await waitForCheckoutHostname(hostname, {
+    timeoutMs: options.timeoutMs,
+    onWait: () => consola.info(
+      `Waiting for ${hostname} to be issued a certificate. This usually takes a minute or two...`
+    )
+  });
+  if (ready) {
+    consola.success(`${hostname} is serving checkout.`);
+    return true;
+  }
+  await deleteChannelCheckoutUrl(channelId, storeHash, accessToken, apiHost);
+  consola.warn(
+    `${hostname} wasn't issued a certificate in time, so the checkout URL was removed and checkout falls back to the default channel's. Re-run with \`--update-checkout-url\` to try again.`
+  );
+  return true;
+}
+async function offerManagedCheckoutUrl(options) {
+  const { storeHash, accessToken, apiHost, channelId, storefrontHostname, config: config2 } = options;
+  const declined = config2.get("declinedCheckoutUrlChannels") ?? [];
+  if (!isManagedHostingHostname(storefrontHostname)) return false;
+  if (options.respectOptOut && declined.includes(channelId)) return false;
+  const site = await getChannelSite(channelId, storeHash, accessToken, apiHost);
+  if (site.isCheckoutUrlCustomized || !isCrossDomainCheckout(site)) return false;
+  const shouldMove = await confirm3({
+    message: `Checkout is on ${findChannelSiteUrl(site, "checkout") ?? "another domain"}. Move it to https://${MANAGED_ZONE_CHECKOUT_PREFIX}${storefrontHostname} so shoppers stay on this domain through payment?`,
+    default: options.defaultAnswer
+  });
+  if (!shouldMove) {
+    if (!declined.includes(channelId)) {
+      config2.set("declinedCheckoutUrlChannels", [...declined, channelId]);
+    }
+    warnOnCrossDomainCheckout(site);
+    consola.info(
+      `Won't ask again after deploys for channel ${channelId}. To set it later, run \`catalyst channels update --channel-id ${channelId} --checkout-url https://${MANAGED_ZONE_CHECKOUT_PREFIX}${storefrontHostname}\`.`
+    );
+    return true;
+  }
+  await runChannelCheckoutUrlFlow({
+    storeHash,
+    accessToken,
+    apiHost,
+    channelId,
+    storefrontHostname
+  });
+  return true;
+}
 
 // src/cli/lib/create-channel-flow.ts
 import { checkbox, input as input4, select as select3 } from "@inquirer/prompts";
@@ -2404,16 +2557,19 @@ Examples:
   await getTelemetry().identify(storeHash);
   const touchesCheckout = options.checkoutUrl !== void 0 || options.removeCheckoutUrl === true;
   const updatesSiteUrl = options.hostname !== void 0 || !touchesCheckout;
+  const offersCheckout = updatesSiteUrl && !touchesCheckout && canPrompt();
   let channelId = options.channelId;
+  let siteHostname;
   if (updatesSiteUrl) {
     try {
-      ({ channelId } = await runChannelSiteUrlFlow({
+      ({ channelId, hostname: siteHostname } = await runChannelSiteUrlFlow({
         storeHash,
         accessToken,
         apiHost,
         projectUuid: options.projectUuid ?? config2.get("projectUuid"),
         channelId: options.channelId,
-        hostname: options.hostname
+        hostname: options.hostname,
+        diagnoseCheckout: !offersCheckout
       }));
     } catch (error) {
       if (error instanceof NoLinkedProjectError) {
@@ -2426,6 +2582,22 @@ Examples:
       throw error;
     }
   }
+  if (offersCheckout && channelId !== void 0 && siteHostname !== void 0) {
+    const offered = await offerManagedCheckoutUrl({
+      storeHash,
+      accessToken,
+      apiHost,
+      channelId,
+      storefrontHostname: siteHostname,
+      config: config2,
+      // Explicit command, so an earlier decline doesn't silence it.
+      respectOptOut: false,
+      defaultAnswer: true
+    });
+    if (!offered) {
+      warnOnCrossDomainCheckout(await getChannelSite(channelId, storeHash, accessToken, apiHost));
+    }
+  }
   if (touchesCheckout) {
     const channel = channelId === void 0 ? await resolveChannel({ storeHash, accessToken, apiHost }) : { id: channelId, name: void 0 };
     const label = channel.name ? `"${channel.name}" (${channel.id})` : String(channel.id);
@@ -2439,7 +2611,7 @@ Examples:
       );
       consola.success(`Updated channel ${label} checkout URL to ${options.checkoutUrl}.`);
       reportChannelSite(updated);
-      await warnOnCrossDomainCheckout(updated, { storeHash, accessToken, apiHost });
+      warnOnCrossDomainCheckout(updated);
     } else {
       await deleteChannelCheckoutUrl(channel.id, storeHash, accessToken, apiHost);
       consola.success(
@@ -2447,7 +2619,7 @@ Examples:
       );
       const reverted = await getChannelSite(channel.id, storeHash, accessToken, apiHost);
       reportChannelSite(reverted);
-      await warnOnCrossDomainCheckout(reverted, { storeHash, accessToken, apiHost });
+      warnOnCrossDomainCheckout(reverted);
     }
   }
   process.exit(0);
@@ -2666,7 +2838,7 @@ Examples:
   const site = await getChannelSite(channel.id, storeHash, accessToken, apiHost);
   consola.success(`Channel ${label}:`);
   reportChannelSite(site);
-  const report = await warnOnCrossDomainCheckout(site, { storeHash, accessToken, apiHost });
+  const report = warnOnCrossDomainCheckout(site);
   if (report.crossDomain && report.storefrontOnManagedZone !== true) {
     const suggested = report.suggestion ?? "<domain>";
     if (!process.stdin.isTTY) {
@@ -2676,7 +2848,7 @@ Examples:
       process.exit(0);
       return;
     }
-    const shouldSet = await confirm3({
+    const shouldSet = await confirm4({
       message: "Set a checkout URL for this channel now?",
       default: true
     });
@@ -3408,7 +3580,7 @@ Examples:
 });
 
 // src/cli/commands/deploy.ts
-import { confirm as confirm4 } from "@inquirer/prompts";
+import { confirm as confirm6 } from "@inquirer/prompts";
 import AdmZip from "adm-zip";
 import { Command as Command6, Option as Option7 } from "commander";
 import { colorize as colorize7 } from "consola/utils";
@@ -3417,6 +3589,68 @@ import { join as join13 } from "path";
 import yoctoSpinner3 from "yocto-spinner";
 import { z as z13 } from "zod";
 
+// src/cli/lib/deploy-channel-urls.ts
+import { confirm as confirm5 } from "@inquirer/prompts";
+function deployedChannelId(secrets) {
+  const raw = secrets.find((secret) => secret.key === "BIGCOMMERCE_CHANNEL_ID")?.value ?? process.env.BIGCOMMERCE_CHANNEL_ID;
+  const id = Number(raw);
+  return Number.isInteger(id) && id > 0 ? id : void 0;
+}
+async function offerChannelUrlUpdates(options) {
+  const { storeHash, accessToken, apiHost, projectUuid, config: config2, channelId } = options;
+  if (!canPrompt() || channelId === void 0) return;
+  const [site, projects2] = await Promise.all([
+    getChannelSite(channelId, storeHash, accessToken, apiHost),
+    fetchProjects(storeHash, accessToken, apiHost)
+  ]);
+  const deploymentHostnames = projects2.find((project) => project.uuid === projectUuid)?.deployment_hostnames ?? [];
+  const storefrontUrl = (findChannelSiteUrl(site, "primary") ?? site.url).replace(/\/$/, "");
+  let storefrontHostname = deploymentHostnames.find(
+    (deployed) => storefrontUrl === `https://${deployed}`
+  );
+  storefrontHostname ?? (storefrontHostname = await offerSiteUrl({ ...options, channelId }, storefrontUrl));
+  if (storefrontHostname === void 0) return;
+  await offerManagedCheckoutUrl({
+    storeHash,
+    accessToken,
+    apiHost,
+    channelId,
+    storefrontHostname,
+    config: config2,
+    respectOptOut: true,
+    defaultAnswer: false
+  });
+}
+async function offerSiteUrl(options, storefrontUrl) {
+  const { storeHash, accessToken, apiHost, projectUuid, config: config2, channelId } = options;
+  const declined = config2.get("declinedSiteUrlChannels") ?? [];
+  if (declined.includes(channelId)) return void 0;
+  const shouldUpdate = await confirm5({
+    message: `Channel ${channelId}'s site URL is ${storefrontUrl}. Point it at this deployment?`,
+    // Unasked-for after a deploy, so Enter mustn't change a live channel.
+    default: false
+  });
+  if (!shouldUpdate) {
+    config2.set("declinedSiteUrlChannels", [...declined, channelId]);
+    consola.info(
+      `Won't ask again for channel ${channelId}. To change it later, run \`catalyst channels update --channel-id ${channelId}\`.`
+    );
+    return void 0;
+  }
+  const { hostname } = await runChannelSiteUrlFlow({
+    storeHash,
+    accessToken,
+    apiHost,
+    projectUuid,
+    // The deploy knows both; the hostname picker only shows if it reported none.
+    channelId,
+    hostname: options.deploymentHostname,
+    // On the managed zone the checkout offer follows; elsewhere, warn instead.
+    diagnoseCheckout: !isManagedHostingHostname(options.deploymentHostname ?? "")
+  });
+  return hostname;
+}
+
 // src/cli/lib/deployment-errors.ts
 var ERROR_MESSAGES = {
   10: "Something went wrong on our end. Please try again. If the issue persists, contact support.",
@@ -3543,6 +3777,11 @@ var uploadBundleZip = async (uploadUrl) => {
   consola.success("Bundle uploaded successfully.");
   return true;
 };
+var NATIVE_HOSTING_ENV = {
+  type: "plain_text",
+  key: "CATALYST_HOSTING",
+  value: "native"
+};
 var parseEnvironmentVariables = (secretOption) => {
   return secretOption?.map((envVar) => {
     const { key, value } = parseEnvAssignment(envVar);
@@ -3671,6 +3910,10 @@ var deploy = new Command6("deploy").configureHelp({ showGlobalOptions: true }).d
 Environment variables saved with \`catalyst env add\` are sent automatically on every deploy.
 Use \`--secret\` to set or override a variable for a single run.
 
+Without \`--update-site-url\` or \`--update-checkout-url\`, an interactive deploy offers to
+point the channel's site URL at the deployment and to move its checkout onto the same domain.
+Each is checked on every deploy; declining either is saved in .bigcommerce/project.json.
+
 Example:
   $ catalyst deploy --secret BIGCOMMERCE_STORE_HASH=<YOUR_STORE_HASH> --secret BIGCOMMERCE_STOREFRONT_TOKEN=<YOUR_STOREFRONT_TOKEN>`
 ).addOption(storeHashOption()).addOption(accessTokenOption()).addOption(apiHostOption()).addOption(projectUuidOption()).option(
@@ -3740,7 +3983,7 @@ Example:
     consola.success(`Linked project "${selected.name}".`);
   }
   if (!getProjectState().isTransformed) {
-    const shouldSetup = await confirm4({
+    const shouldSetup = await confirm6({
       message: "Your project is not yet set up for Commerce Hosting deployments. Would you like to run the Commerce Hosting setup now?",
       default: true
     });
@@ -3796,7 +4039,7 @@ Example:
   const flagSecrets = parseEnvironmentVariables(options.secret) ?? [];
   const persistedSecrets = toDeploymentSecrets(getStoredEnv(config2));
   const mergedSecrets = mergeDeploymentSecrets(persistedSecrets, flagSecrets);
-  const environmentVariables = mergedSecrets.length > 0 ? mergedSecrets : void 0;
+  const environmentVariables = [...mergedSecrets, NATIVE_HOSTING_ENV];
   const { deployment_uuid: deploymentUuid } = await createDeployment(
     projectUuid,
     uploadSignature.upload_uuid,
@@ -3820,9 +4063,10 @@ Example:
     );
   };
   let resolvedChannelId;
+  let siteHostname;
   if (options.updateSiteUrl) {
     try {
-      ({ channelId: resolvedChannelId } = await runChannelSiteUrlFlow({
+      ({ channelId: resolvedChannelId, hostname: siteHostname } = await runChannelSiteUrlFlow({
         storeHash,
         accessToken,
         apiHost,
@@ -3839,16 +4083,32 @@ Example:
         storeHash,
         accessToken,
         apiHost,
-        channelId: resolvedChannelId
+        channelId: resolvedChannelId,
+        storefrontHostname: siteHostname
       });
     } catch (error) {
       warnChannelFlowFailed("checkout URL", error);
     }
   }
+  if (!options.updateSiteUrl && !options.updateCheckoutUrl) {
+    try {
+      await offerChannelUrlUpdates({
+        storeHash,
+        accessToken,
+        apiHost,
+        projectUuid,
+        config: config2,
+        deploymentHostname,
+        channelId: deployedChannelId(mergedSecrets)
+      });
+    } catch (error) {
+      warnChannelFlowFailed("URLs", error);
+    }
+  }
 });
 
 // src/cli/commands/domains.ts
-import { confirm as confirm5, select as select6 } from "@inquirer/prompts";
+import { confirm as confirm7, select as select6 } from "@inquirer/prompts";
 import { Command as Command7, Option as Option8 } from "commander";
 import { colorize as colorize9 } from "consola/utils";
 
@@ -4630,7 +4890,7 @@ Examples:
     context.apiHost
   );
   if (current.verification_status === "verified" && !options.force) {
-    const confirmed = await confirm5({
+    const confirmed = await confirm7({
       message: `Remove active domain ${current.domain}? Traffic may stop routing to this project.`,
       default: false
     });
@@ -5134,7 +5394,7 @@ Examples:
 var logs = new Command9("logs").alias("log").configureHelp({ showGlobalOptions: true }).description("View logs from your deployed application.").addCommand(tail, { isDefault: true }).addCommand(query);
 
 // src/cli/commands/projects.ts
-import { confirm as confirm6, input as input6, select as select7 } from "@inquirer/prompts";
+import { confirm as confirm8, input as input6, select as select7 } from "@inquirer/prompts";
 import { Command as Command10 } from "commander";
 import { colorize as colorize11 } from "consola/utils";
 async function offerCommerceHostingSetup(projectUuid, credentials) {
@@ -5143,7 +5403,7 @@ async function offerCommerceHostingSetup(projectUuid, credentials) {
     await cleanupCloudflareIncompatibilities(projectDir);
     return;
   }
-  const shouldSetup = await confirm6({
+  const shouldSetup = await confirm8({
     message: "Your project has been linked, but is not fully set up for Commerce Hosting deployments yet. Would you like to run the setup now?",
     default: true
   });
@@ -5339,7 +5599,7 @@ Examples:
   }
   if (!options.force) {
     const label = targetName ? `"${targetName}" (${targetUuid})` : targetUuid;
-    const confirmed = await confirm6({
+    const confirmed = await confirm8({
       message: `Are you sure you want to delete project ${label}? This action is irreversible and will permanently destroy the project and all of its data.`,
       default: false
     });
@@ -5462,7 +5722,7 @@ Examples:
 
 // src/cli/commands/upgrade.ts
 import { Command as Command13, Option as Option11 } from "@commander-js/extra-typings";
-import { confirm as confirm7 } from "@inquirer/prompts";
+import { confirm as confirm9 } from "@inquirer/prompts";
 import { execa as execa4 } from "execa";
 import {
   access as access3,
@@ -6042,7 +6302,7 @@ async function resolveBaseRef(project, fromOption, assumeYes) {
   const guess = `${family}@${project.pkg.version}`;
   consola.warn(`No \`catalyst.ref\` found in package.json. Inferred base: ${guess}`);
   if (assumeYes) return guess;
-  const ok = await confirm7({ message: `Upgrade from ${guess}?`, default: true }).catch(() => false);
+  const ok = await confirm9({ message: `Upgrade from ${guess}?`, default: true }).catch(() => false);
   if (!ok) {
     consola.info("Re-run with `--from <ref>` to set the base version explicitly.");
     return null;
@@ -6344,7 +6604,7 @@ to raise the GitHub API rate limit.`
     printWorkspaceFindings(workspaceDeps);
     let migratedDeps = 0;
     if (workspaceDeps.length) {
-      const accepted = stampedText !== null && (options.yes === true || Boolean(process.stdin.isTTY) && await confirm7({
+      const accepted = stampedText !== null && (options.yes === true || Boolean(process.stdin.isTTY) && await confirm9({
         message: "Replace them with the published versions?",
         default: true
       }).catch(() => false));