@bigcommerce/catalyst 1.3.0 → 1.4.1

package/dist/cli.js

@@ -25,7 +25,7 @@ import { randomBytes, randomUUID } from "crypto";
 // package.json
 var package_default = {
   name: "@bigcommerce/catalyst",
-  version: "1.3.0",
+  version: "1.4.1",
   type: "module",
   repository: {
     type: "git",
@@ -49,7 +49,7 @@ var package_default = {
     build: "tsup"
   },
   engines: {
-    node: "^20.0.0 || ^22.0.0 || ^24.0.0"
+    node: "^22.0.0 || ^24.0.0"
   },
   dependencies: {
     "@commander-js/extra-typings": "^14.0.0",
@@ -69,6 +69,7 @@ var package_default = {
     semver: "^7.7.4",
     "std-env": "^3.9.0",
     tar: "^7.5.7",
+    tldts: "^7.4.12",
     "yocto-spinner": "^1.0.0",
     zod: "^4.0.5"
   },
@@ -91,7 +92,12 @@ var package_default = {
     vitest: "^3.2.4"
   },
   peerDependencies: {
-    "@opennextjs/cloudflare": "1.17.3"
+    "@opennextjs/cloudflare": "^1.17.3"
+  },
+  peerDependenciesMeta: {
+    "@opennextjs/cloudflare": {
+      optional: true
+    }
   }
 };
 
@@ -209,7 +215,7 @@ import { Command as Command15 } from "commander";
 import { colorize as colorize13 } from "consola/utils";
 
 // src/cli/commands/auth.ts
-import { Command } from "commander";
+import { Command, Option as Option2 } from "commander";
 import { z as z5 } from "zod";
 
 // src/cli/lib/auth-errors.ts
@@ -679,6 +685,19 @@ async function fetchStoreProfile2(storeHash, accessToken, apiHost) {
   }
   return result.data.data;
 }
+async function checkCredentials(storeHash, accessToken, apiHost) {
+  try {
+    const { store_name: storeName } = await fetchStoreProfile2(storeHash, accessToken, apiHost);
+    return { valid: true, storeName };
+  } catch (error) {
+    if (error instanceof UnauthorizedError) return { valid: false, reason: "unauthorized" };
+    return {
+      valid: false,
+      reason: "unverifiable",
+      message: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
 var whoami = new Command("whoami").configureHelp({ showGlobalOptions: true }).description("Verify stored credentials and display store/project info.").addHelpText(
   "after",
   `
@@ -733,7 +752,7 @@ Example:
   }
 });
 var login2 = new Command("login").configureHelp({ showGlobalOptions: true }).description(
-  "Authenticate via browser using the OAuth device code flow. Falls back to an interactive store hash + access token prompt if the browser flow is unavailable. If already logged in, displays current credentials and suggests running `catalyst auth logout` to re-authenticate."
+  "Authenticate via browser using the OAuth device code flow. Falls back to an interactive store hash + access token prompt if the browser flow is unavailable. Passing --store-hash and --access-token verifies and stores those credentials instead. If already logged in with credentials that still work, displays them and suggests `catalyst auth logout`; if the stored token has expired or been revoked, re-authenticates in place."
 ).addHelpText(
   "after",
   `
@@ -742,19 +761,67 @@ Examples:
   $ catalyst auth login
 
   # Login with existing credentials (skips interactive flow)
-  $ catalyst auth login --store-hash <STORE_HASH> --access-token <ACCESS_TOKEN>`
-).addOption(storeHashOption()).addOption(accessTokenOption()).addOption(apiHostOption()).addOption(loginUrlOption()).action(async (options) => {
+  $ catalyst auth login --store-hash <STORE_HASH> --access-token <ACCESS_TOKEN>
+
+  # Re-authenticate without checking the stored credentials first
+  $ catalyst auth login --force`
+).addOption(storeHashOption()).addOption(accessTokenOption()).addOption(apiHostOption()).addOption(loginUrlOption()).addOption(
+  new Option2(
+    "--force",
+    "Skip the check on any credentials already stored and re-authenticate regardless."
+  )
+).action(async (options, command) => {
   try {
     const config2 = getProjectConfig();
     const apiHost = resolveApiHost(options, config2);
     const storeHash = options.storeHash ?? config2.get("storeHash");
     const accessToken = options.accessToken ?? config2.get("accessToken");
-    if (storeHash && accessToken) {
-      consola.info(`Already logged in to store ${storeHash}.`);
-      consola.info("Run `catalyst auth logout` first to re-authenticate.");
+    const suppliedOnCli = command.getOptionValueSource("storeHash") === "cli" && command.getOptionValueSource("accessToken") === "cli";
+    if (suppliedOnCli && storeHash && accessToken) {
+      if (!options.force) {
+        const status = await checkCredentials(storeHash, accessToken, apiHost);
+        if (!status.valid && status.reason === "unauthorized") {
+          consola.error(`The credentials provided for store ${storeHash} were rejected.`);
+          consola.info(
+            "Check the store hash and access token, or run `catalyst auth login` without them to authenticate in the browser."
+          );
+          process.exit(1);
+          return;
+        }
+        if (!status.valid) {
+          consola.warn(`Couldn't verify the credentials provided: ${status.message}`);
+        }
+      }
+      config2.set("storeHash", storeHash);
+      config2.set("accessToken", accessToken);
+      consola.success(`Logged in to store ${storeHash}.`);
       process.exit(0);
       return;
     }
+    if (storeHash && accessToken && !options.force) {
+      const status = await checkCredentials(storeHash, accessToken, apiHost);
+      if (status.valid) {
+        consola.info(`Already logged in to ${status.storeName} (${storeHash}).`);
+        consola.info(
+          "Run `catalyst auth logout` first to re-authenticate, or `catalyst auth login --force` to skip this check."
+        );
+        process.exit(0);
+        return;
+      }
+      if (status.reason === "unverifiable") {
+        consola.warn(
+          `Found credentials for store ${storeHash} but couldn't verify them: ${status.message}`
+        );
+        consola.info(
+          "Keeping them. Re-run once the API is reachable, or `catalyst auth login --force` to re-authenticate regardless."
+        );
+        process.exit(0);
+        return;
+      }
+      consola.warn(
+        `Stored credentials for store ${storeHash} are no longer valid \u2014 re-authenticating.`
+      );
+    }
     const credentials = await login(options.loginUrl, apiHost);
     config2.set("storeHash", credentials.storeHash);
     config2.set("accessToken", credentials.accessToken);
@@ -801,10 +868,10 @@ Example:
 var auth = new Command("auth").configureHelp({ showGlobalOptions: true }).description("Manage authentication for the BigCommerce CLI.").addCommand(whoami).addCommand(login2).addCommand(logout);
 
 // src/cli/commands/build.ts
-import { Command as Command2, InvalidArgumentError, Option as Option2 } from "commander";
+import { Command as Command2, InvalidArgumentError, Option as Option3 } from "commander";
 import { execa as execa2 } from "execa";
 import { copyFile, cp, rm, writeFile } from "fs/promises";
-import { join as join4 } from "path";
+import { join as join6 } from "path";
 import { valid as validSemver } from "semver";
 
 // src/cli/lib/build-env.ts
@@ -839,173 +906,625 @@ function loadBuildEnv({ envPath, cwd = process.cwd() }) {
   }
 }
 
-// src/cli/lib/get-module-cli-path.ts
+// src/cli/lib/commerce-hosting.ts
+import { confirm as confirm2, input as input2, select, Separator } from "@inquirer/prompts";
+import { colorize as colorize3 } from "consola/utils";
+import { existsSync as existsSync2, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "fs";
 import { dirname, join as join2 } from "path";
-import { fileURLToPath } from "url";
-function getModuleCliPath() {
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = dirname(__filename);
-  return join2(__dirname, "..");
+import { minVersion, satisfies, lt as semverLt, validRange } from "semver";
+import { z as z6 } from "zod";
+
+// src/cli/lib/sort-package-json.ts
+var FIELD_ORDER = [
+  "name",
+  "description",
+  "version",
+  "private",
+  "engines",
+  "scripts",
+  "dependencies",
+  "devDependencies"
+];
+function sortPackageJsonFields(pkg) {
+  const ordered = {};
+  FIELD_ORDER.forEach((field) => {
+    if (field in pkg) {
+      ordered[field] = pkg[field];
+    }
+  });
+  Object.keys(pkg).forEach((key) => {
+    if (!(key in ordered)) {
+      ordered[key] = pkg[key];
+    }
+  });
+  return ordered;
 }
 
-// src/cli/lib/project-state.ts
-import { existsSync as existsSync2, readFileSync } from "fs";
-import { join as join3 } from "path";
-import { z as z6 } from "zod";
-var projectJsonSchema = z6.looseObject({
-  projectUuid: z6.string().optional()
-});
-var packageJsonSchema = z6.looseObject({
+// src/cli/lib/commerce-hosting.ts
+var OPENNEXT_CLOUDFLARE_VERSION = "1.20.6";
+var OPENNEXT_REQUIRED_NEXT_RANGE = ">=15.5.24 <16 || >=16.3.3";
+var corePackageJsonSchema = z6.looseObject({
   dependencies: z6.record(z6.string(), z6.string()).optional()
 });
-var safeReadJson = (path) => {
+var projectJsonSchema = z6.looseObject({});
+var readProjectJson = (path) => {
+  if (!existsSync2(path)) return {};
   try {
-    return JSON.parse(readFileSync(path, "utf-8"));
+    const parsed = projectJsonSchema.safeParse(JSON.parse(readFileSync(path, "utf-8")));
+    return parsed.success ? parsed.data : {};
   } catch {
-    return null;
+    return {};
   }
 };
-function getProjectState(cwd = process.cwd()) {
-  const projectJson = projectJsonSchema.safeParse(
-    safeReadJson(join3(cwd, ".bigcommerce", "project.json"))
-  );
-  const projectUuid = projectJson.success ? projectJson.data.projectUuid : void 0;
-  const hasMiddleware = existsSync2(join3(cwd, "middleware.ts"));
-  const hasProxy = existsSync2(join3(cwd, "proxy.ts"));
-  const pkgJson = packageJsonSchema.safeParse(safeReadJson(join3(cwd, "package.json")));
-  const hasOpenNextDep = pkgJson.success ? Boolean(pkgJson.data.dependencies?.["@opennextjs/cloudflare"]) : false;
-  const isLinked = Boolean(projectUuid);
-  const isTransformed = hasMiddleware && !hasProxy && hasOpenNextDep;
-  const isFullySetUp = isLinked && isTransformed;
-  return {
-    projectUuid,
-    hasMiddleware,
-    hasProxy,
-    hasOpenNextDep,
-    isLinked,
-    isTransformed,
-    isFullySetUp
-  };
-}
-
-// src/cli/lib/required-build-env.ts
-var REQUIRED_BUILD_ENV_VARS = [
-  "BIGCOMMERCE_STORE_HASH",
-  "BIGCOMMERCE_STOREFRONT_TOKEN",
-  "BIGCOMMERCE_CHANNEL_ID",
-  "AUTH_SECRET"
-];
-var findMissingBuildEnv = (env2 = process.env) => {
-  return REQUIRED_BUILD_ENV_VARS.filter((name) => {
-    const value = env2[name];
-    return value === void 0 || value.trim() === "";
-  });
+var writeJson = (path, value) => {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, `${JSON.stringify(value, null, 2)}
+`);
 };
-var assertRequiredBuildEnv = (env2 = process.env) => {
-  const missing = findMissingBuildEnv(env2);
-  if (missing.length === 0) {
+var convertProxyToMiddleware = (projectDir) => {
+  const proxyPath = join2(projectDir, "proxy.ts");
+  const middlewarePath = join2(projectDir, "middleware.ts");
+  if (!existsSync2(proxyPath)) return;
+  const contents = readFileSync(proxyPath, "utf-8").replace("export const proxy", "export const middleware").replace("export const config = {", "export const config = {\n  runtime: 'experimental-edge',");
+  writeFileSync(middlewarePath, contents);
+  unlinkSync(proxyPath);
+};
+var cleanupCloudflareIncompatibilities = async (projectDir) => {
+  const instrumentationPath = join2(projectDir, "instrumentation.ts");
+  if (!existsSync2(instrumentationPath)) return;
+  if (!process.stdin.isTTY) {
+    consola.warn(
+      "instrumentation.ts is present and may be incompatible with the Cloudflare Workers bundle (the default @vercel/otel scaffolding throws at cold start under workerd). Skipping automatic cleanup in non-interactive mode \u2014 re-run interactively to remove it, or delete/gate it manually."
+    );
     return;
   }
-  const missingList = missing.map((name) => `  - ${name}`).join("\n");
-  throw new UserActionableError(
-    `Missing required environment variable${missing.length === 1 ? "" : "s"} for the build:
-${missingList}
-
-These are read by the build itself, so they must be set before it runs. The build automatically loads \`.env.local\` and \`.env\` from the current directory (${process.cwd()}) \u2014 add the variables above to one of those files (\`.env.local\` takes precedence).
-To load an env file from a different location, pass \`--env-path <path>\` (for example \`--env-path ../.env.local\` when running from a subdirectory).`
-  );
+  const shouldRemove = await confirm2({
+    message: 'Catalyst found instrumentation.ts, which is incompatible with the Cloudflare Workers bundle when it uses @vercel/otel (causes "Failed to prepare server" at cold start).\nRemove it and drop @vercel/otel from package.json? (required for native hosting)',
+    default: true
+  });
+  if (!shouldRemove) {
+    consola.info(
+      'Leaving instrumentation.ts in place. The Cloudflare worker will continue to log "Failed to prepare server" at cold start until this is resolved manually.'
+    );
+    return;
+  }
+  unlinkSync(instrumentationPath);
+  consola.info("Removed instrumentation.ts (incompatible with Cloudflare Workers).");
+  const corePackageJsonPath = join2(projectDir, "package.json");
+  if (existsSync2(corePackageJsonPath)) {
+    const pkg = corePackageJsonSchema.parse(JSON.parse(readFileSync(corePackageJsonPath, "utf-8")));
+    if (pkg.dependencies && "@vercel/otel" in pkg.dependencies) {
+      const { "@vercel/otel": _removedVercelOtel, ...preservedDeps } = pkg.dependencies;
+      pkg.dependencies = preservedDeps;
+      writeJson(corePackageJsonPath, sortPackageJsonFields(pkg));
+      consola.info("Dropped @vercel/otel from package.json.");
+    }
+  }
 };
-
-// src/cli/lib/wrangler-config.ts
-function getCompatibilityDate(now = /* @__PURE__ */ new Date()) {
-  const date = new Date(now);
-  date.setUTCMonth(date.getUTCMonth() - 1);
-  return date.toISOString().slice(0, 10);
-}
-function getWranglerConfig(projectUuid) {
-  return {
-    $schema: "node_modules/wrangler/config-schema.json",
-    main: "../.open-next/worker.js",
-    name: `project-${projectUuid}`,
-    compatibility_date: getCompatibilityDate(),
-    compatibility_flags: ["nodejs_compat", "global_fetch_strictly_public"],
-    observability: {
-      enabled: true,
-      head_sampling_rate: 0.05,
-      logs: {
-        enabled: true,
-        head_sampling_rate: 1,
-        invocation_logs: false
-      }
-    },
-    assets: {
-      directory: "../.open-next/assets",
-      binding: "ASSETS"
-    },
-    services: [
-      {
-        binding: "WORKER_SELF_REFERENCE",
-        service: `project-${projectUuid}`
-      }
-    ],
-    r2_buckets: [
-      {
-        binding: "NEXT_INC_CACHE_R2_BUCKET",
-        bucket_name: `project-${projectUuid}`
-      }
-    ],
-    durable_objects: {
-      bindings: [
-        {
-          name: "NEXT_CACHE_DO_QUEUE",
-          class_name: "DOQueueHandler"
-        },
-        {
-          name: "NEXT_TAG_CACHE_DO_SHARDED",
-          class_name: "DOShardedTagCache"
-        },
-        {
-          name: "NEXT_CACHE_DO_PURGE",
-          class_name: "BucketCachePurge"
-        }
-      ]
-    },
-    migrations: [
-      {
-        tag: "v1",
-        new_sqlite_classes: ["DOQueueHandler", "DOShardedTagCache", "BucketCachePurge"]
-      }
-    ]
-  };
-}
-
-// src/cli/commands/build.ts
-var WRANGLER_VERSION = "4.90.0";
-var DIST_TAG_PATTERN = /^[a-zA-Z0-9][a-zA-Z0-9._-]*$/;
-var parseWranglerVersion = (value) => {
-  if (!validSemver(value) && !DIST_TAG_PATTERN.test(value)) {
-    throw new InvalidArgumentError(
-      `"${value}" is not a valid Wrangler version or dist-tag (e.g. 4.90.0 or latest).`
+var reconcileOpenNextVersion = async (projectDir, packageManager, { canUpgrade }) => {
+  const corePackageJsonPath = join2(projectDir, "package.json");
+  if (!existsSync2(corePackageJsonPath)) return false;
+  const pkg = corePackageJsonSchema.parse(JSON.parse(readFileSync(corePackageJsonPath, "utf-8")));
+  const range = pkg.dependencies?.["@opennextjs/cloudflare"];
+  if (range === void 0) return false;
+  if (!validRange(range)) return false;
+  if (satisfies(OPENNEXT_CLOUDFLARE_VERSION, range)) return false;
+  const current = minVersion(range)?.version;
+  if (current === void 0 || !semverLt(current, OPENNEXT_CLOUDFLARE_VERSION)) return false;
+  const manualStep = `\`${packageManager} add @opennextjs/cloudflare@${OPENNEXT_CLOUDFLARE_VERSION}\``;
+  const behind = `This project pins @opennextjs/cloudflare ${current}, but this CLI targets ${OPENNEXT_CLOUDFLARE_VERSION}.`;
+  const nextRange = pkg.dependencies?.next;
+  const nextVersion = nextRange !== void 0 && validRange(nextRange) ? minVersion(nextRange) : null;
+  if (nextVersion !== null && !satisfies(nextVersion.version, OPENNEXT_REQUIRED_NEXT_RANGE)) {
+    consola.warn(
+      `${behind} That release needs Next.js ${OPENNEXT_REQUIRED_NEXT_RANGE}, but this project is on ${nextVersion.version}. Run \`catalyst upgrade\` to move core and Next first, then re-run the deploy to pick up the adapter.`
     );
+    return false;
   }
-  return value;
+  if (!canUpgrade) {
+    consola.warn(
+      `${behind} The deploy will use the existing build output. Re-run without \`--prebuilt\`, or update it with ${manualStep}, to pick up adapter fixes released since then.`
+    );
+    return false;
+  }
+  if (!process.stdin.isTTY) {
+    consola.warn(
+      `${behind} Skipping the upgrade prompt in a non-interactive environment. Update it with ${manualStep} and commit the lockfile to pick up adapter fixes released since then.`
+    );
+    return false;
+  }
+  const shouldUpgrade = await confirm2({
+    message: `${behind} Adapter fixes released since then are not applied. Update it to ${OPENNEXT_CLOUDFLARE_VERSION} and reinstall now?`,
+    default: true
+  });
+  if (!shouldUpgrade) {
+    consola.info(`Keeping @opennextjs/cloudflare ${current}. Update it later with ${manualStep}.`);
+    return false;
+  }
+  pkg.dependencies = {
+    ...pkg.dependencies,
+    "@opennextjs/cloudflare": OPENNEXT_CLOUDFLARE_VERSION
+  };
+  writeJson(corePackageJsonPath, sortPackageJsonFields(pkg));
+  consola.info(`Updated @opennextjs/cloudflare to ${OPENNEXT_CLOUDFLARE_VERSION}.`);
+  return true;
 };
-async function buildCatalystProject(projectUuid, wranglerVersion = WRANGLER_VERSION) {
-  assertRequiredBuildEnv();
-  const coreDir = process.cwd();
-  const openNextOutDir = join4(coreDir, ".open-next");
-  const bigcommerceDistDir = join4(coreDir, ".bigcommerce", "dist");
-  const wranglerConfig = getWranglerConfig(projectUuid);
-  await rm(bigcommerceDistDir, { recursive: true, force: true });
-  consola.start("Copying templates...");
-  await copyFile(
-    join4(getModuleCliPath(), "templates", "open-next.config.ts"),
-    join4(coreDir, ".bigcommerce", "open-next.config.ts")
-  );
-  await writeFile(
-    join4(coreDir, ".bigcommerce", "wrangler.jsonc"),
-    JSON.stringify(wranglerConfig, null, 2)
-  );
+var setupCommerceHosting = async ({
+  projectDir,
+  projectUuid,
+  storeHash,
+  accessToken
+}) => {
+  await cleanupCloudflareIncompatibilities(projectDir);
+  const corePackageJsonPath = join2(projectDir, "package.json");
+  const pkg = corePackageJsonSchema.parse(JSON.parse(readFileSync(corePackageJsonPath, "utf-8")));
+  pkg.dependencies = {
+    ...pkg.dependencies,
+    "@opennextjs/cloudflare": OPENNEXT_CLOUDFLARE_VERSION
+  };
+  writeJson(corePackageJsonPath, sortPackageJsonFields(pkg));
+  const projectJsonPath = join2(projectDir, ".bigcommerce", "project.json");
+  const projectJson = {
+    ...readProjectJson(projectJsonPath),
+    projectUuid,
+    framework: "catalyst"
+  };
+  if (storeHash) projectJson.storeHash = storeHash;
+  if (accessToken) projectJson.accessToken = accessToken;
+  writeJson(projectJsonPath, projectJson);
+  convertProxyToMiddleware(projectDir);
+};
+var NoLinkedProjectError = class extends Error {
+  constructor() {
+    super("No infrastructure project linked: user declined to create one.");
+    this.name = "NoLinkedProjectError";
+  }
+};
+async function promptForNewProjectName(api) {
+  const newProjectName = await input2({ message: "Enter a name for the new project:" });
+  const data = await createProject(newProjectName, api.storeHash, api.accessToken, api.apiHost);
+  consola.success(`Project "${data.name}" created successfully.`);
+  return { uuid: data.uuid, name: data.name, deployment_hostnames: [] };
+}
+async function selectOrCreateInfrastructureProject(api, linkedProjectUuid) {
+  consola.start("Fetching projects...");
+  const existingProjects = await fetchProjects(api.storeHash, api.accessToken, api.apiHost);
+  consola.success("Projects fetched.");
+  if (existingProjects.length === 0) {
+    const shouldCreate = await confirm2({
+      message: "There are not any hosting projects that you can link to yet. Would you like to create one?",
+      default: true
+    });
+    if (!shouldCreate) {
+      throw new NoLinkedProjectError();
+    }
+    return promptForNewProjectName(api);
+  }
+  const choices = [
+    ...existingProjects.map((p) => ({
+      name: p.uuid === linkedProjectUuid ? `${p.name} ${colorize3("green", "[linked]")}` : p.name,
+      value: p.uuid,
+      description: p.uuid
+    })),
+    {
+      name: "Create a new project",
+      value: "create",
+      description: "Create a new hosting project for this Catalyst storefront."
+    }
+  ];
+  const selected = await select({
+    message: "Select a project or create a new project (Press <enter> to select).",
+    choices
+  });
+  if (selected === "create") {
+    return promptForNewProjectName(api);
+  }
+  const matched = existingProjects.find((p) => p.uuid === selected);
+  if (!matched) {
+    throw new Error(`Selected project ${String(selected)} not found in fetched list.`);
+  }
+  return matched;
+}
+async function promptForCommerceHostingProject(api, defaultName, autoUseDefaultName, useExistingOnCollision) {
+  const existingProjects = await fetchProjects(api.storeHash, api.accessToken, api.apiHost);
+  const takenNames = existingProjects.map((project) => project.name);
+  if (autoUseDefaultName) {
+    return autoCreateCommerceHostingProject(
+      api,
+      defaultName,
+      existingProjects,
+      useExistingOnCollision
+    );
+  }
+  const conflict = existingProjects.find(
+    (project) => project.name.toLowerCase() === defaultName.toLowerCase()
+  );
+  if (!conflict) {
+    return autoCreateCommerceHostingProject(
+      api,
+      defaultName,
+      existingProjects,
+      useExistingOnCollision
+    );
+  }
+  const hasOtherProjects = existingProjects.length > 1;
+  const choices = [
+    { name: `Use "${conflict.name}"`, value: "use-named" }
+  ];
+  if (hasOtherProjects) {
+    choices.push({ name: "Select from my projects", value: "select-from-list" });
+  }
+  choices.push({ name: "Create a new project", value: "create" });
+  const action = await select({
+    message: hasOtherProjects ? `It looks like you already have an existing Commerce Hosting project named "${conflict.name}". Would you like to use it, select from your projects, or create a new one?` : `It looks like you already have an existing Commerce Hosting project named "${conflict.name}". Would you like to use it, or create a new one?`,
+    choices
+  });
+  if (action === "use-named") {
+    consola.success(`Using existing Commerce Hosting project "${conflict.name}"`);
+    return conflict;
+  }
+  if (action === "create") {
+    return promptAndCreateCommerceHostingProject(api, takenNames, defaultName);
+  }
+  const selected = await select({
+    message: "Which Commerce Hosting project would you like to use?",
+    choices: [
+      ...existingProjects.map((project) => ({
+        name: project.name,
+        value: project,
+        description: project.uuid
+      })),
+      new Separator(),
+      { name: "Create a new project", value: "create-new" }
+    ]
+  });
+  if (selected === "create-new") {
+    return promptAndCreateCommerceHostingProject(api, takenNames, defaultName);
+  }
+  consola.success(`Using existing Commerce Hosting project "${selected.name}"`);
+  return selected;
+}
+async function promptAndCreateCommerceHostingProject(api, takenNames, defaultName) {
+  const projectName = await input2({
+    message: "What would you like to name your Commerce Hosting project?",
+    default: defaultName,
+    validate: (value) => {
+      const trimmed = value.trim();
+      if (!trimmed) return "Project name is required";
+      const conflict = takenNames.find((taken) => taken.toLowerCase() === trimmed.toLowerCase());
+      if (conflict) {
+        return `A Commerce Hosting project named "${conflict}" already exists`;
+      }
+      return true;
+    },
+    theme: {
+      style: {
+        help: () => colorize3(
+          "dim",
+          "(The project that hosts your storefront on Commerce \u2014 often matches your folder name.)"
+        )
+      }
+    }
+  });
+  try {
+    const created = await createProject(
+      projectName.trim(),
+      api.storeHash,
+      api.accessToken,
+      api.apiHost
+    );
+    consola.success(`Commerce Hosting project "${created.name}" created successfully`);
+    return { uuid: created.uuid, name: created.name, deployment_hostnames: [] };
+  } catch (error) {
+    if (error instanceof InfrastructureProjectValidationError) {
+      consola.error(error.message);
+      return promptAndCreateCommerceHostingProject(api, takenNames, defaultName);
+    }
+    throw error;
+  }
+}
+async function resolveCollisionChoice(existingName, useExistingOnCollision) {
+  if (useExistingOnCollision === true) return true;
+  if (!process.stdin.isTTY) return false;
+  return select({
+    message: `A Commerce Hosting project named "${existingName}" already exists. Use the existing project?`,
+    choices: [
+      { name: "Yes", value: true },
+      { name: "No", value: false }
+    ]
+  });
+}
+async function autoCreateCommerceHostingProject(api, name, existingProjects, useExistingOnCollision) {
+  const existing = existingProjects.find(
+    (project) => project.name.toLowerCase() === name.toLowerCase()
+  );
+  if (existing) {
+    const shouldUseExisting = await resolveCollisionChoice(existing.name, useExistingOnCollision);
+    if (shouldUseExisting) {
+      consola.success(`Using existing Commerce Hosting project "${existing.name}"`);
+      return existing;
+    }
+    consola.error(
+      "Not reusing the existing project. Re-run with a different --project-name, or pass --use-existing to reuse it."
+    );
+    process.exit(1);
+  }
+  try {
+    const created = await createProject(name, api.storeHash, api.accessToken, api.apiHost);
+    consola.success(`Commerce Hosting project "${created.name}" created successfully`);
+    return { uuid: created.uuid, name: created.name, deployment_hostnames: [] };
+  } catch (error) {
+    if (error instanceof InfrastructureProjectValidationError) {
+      consola.error(
+        `Failed to create Commerce Hosting project "${name}": ${error.message}
+Re-run with a different --project-name.`
+      );
+      process.exit(1);
+    }
+    throw error;
+  }
+}
+
+// src/cli/lib/detect-package-manager.ts
+import { access } from "fs/promises";
+import { join as join3 } from "path";
+import { detectPackageManager as detectFromDir } from "nypm";
+var PROJECT_LOCKFILES = [
+  ["pnpm-lock.yaml", "pnpm"],
+  ["yarn.lock", "yarn"],
+  ["bun.lock", "bun"],
+  ["bun.lockb", "bun"],
+  ["package-lock.json", "npm"]
+];
+var detectLockfileManager = async (dir) => {
+  const found = await Promise.all(
+    PROJECT_LOCKFILES.map(
+      async ([file, manager]) => access(join3(dir, file)).then(() => manager).catch(() => null)
+    )
+  );
+  return found.find((manager) => manager !== null) ?? null;
+};
+var detectPackageManager = () => {
+  const userAgent = process.env.npm_config_user_agent ?? "";
+  const name = userAgent.split(" ")[0]?.split("/")[0];
+  if (name === "pnpm" || name === "yarn" || name === "bun") {
+    return name;
+  }
+  if (process.versions.bun) {
+    return "bun";
+  }
+  return "npm";
+};
+var detectProjectPackageManager = async (projectDir) => {
+  const detected = await detectFromDir(projectDir);
+  const name = detected?.name;
+  if (name === "pnpm" || name === "yarn" || name === "bun" || name === "npm") {
+    return name;
+  }
+  return "npm";
+};
+
+// src/cli/lib/get-module-cli-path.ts
+import { dirname as dirname2, join as join4 } from "path";
+import { fileURLToPath } from "url";
+function getModuleCliPath() {
+  const __filename = fileURLToPath(import.meta.url);
+  const __dirname = dirname2(__filename);
+  return join4(__dirname, "..");
+}
+
+// src/cli/lib/install-dependencies.ts
+import { installDependencies as installDeps } from "nypm";
+import yoctoSpinner2 from "yocto-spinner";
+var restoreEnv = (key, previous) => {
+  if (previous === void 0) {
+    Reflect.deleteProperty(process.env, key);
+  } else {
+    process.env[key] = previous;
+  }
+};
+var withQuietInstallEnv = async (run2) => {
+  var _a, _b;
+  const prevNodeNoWarnings = process.env.NODE_NO_WARNINGS;
+  const prevDownloadPrompt = process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT;
+  (_a = process.env).NODE_NO_WARNINGS ?? (_a.NODE_NO_WARNINGS = "1");
+  (_b = process.env).COREPACK_ENABLE_DOWNLOAD_PROMPT ?? (_b.COREPACK_ENABLE_DOWNLOAD_PROMPT = "0");
+  try {
+    return await run2();
+  } finally {
+    restoreEnv("NODE_NO_WARNINGS", prevNodeNoWarnings);
+    restoreEnv("COREPACK_ENABLE_DOWNLOAD_PROMPT", prevDownloadPrompt);
+  }
+};
+var installDependencies = async (projectDir, packageManager = "pnpm") => {
+  const spinner = yoctoSpinner2().start(
+    `Installing dependencies with ${packageManager}. This could take a minute...`
+  );
+  try {
+    await withQuietInstallEnv(() => installDeps({ cwd: projectDir, silent: true, packageManager }));
+    spinner.success("Dependencies installed successfully.");
+  } catch (error) {
+    const message = error instanceof Error ? error.message : "unknown error";
+    spinner.error(`Failed to install dependencies: ${message}`);
+    throw error;
+  }
+};
+
+// src/cli/lib/project-state.ts
+import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
+import { join as join5 } from "path";
+import { z as z7 } from "zod";
+var projectJsonSchema2 = z7.looseObject({
+  projectUuid: z7.string().optional()
+});
+var packageJsonSchema = z7.looseObject({
+  dependencies: z7.record(z7.string(), z7.string()).optional()
+});
+var safeReadJson = (path) => {
+  try {
+    return JSON.parse(readFileSync2(path, "utf-8"));
+  } catch {
+    return null;
+  }
+};
+function getProjectState(cwd = process.cwd()) {
+  const projectJson = projectJsonSchema2.safeParse(
+    safeReadJson(join5(cwd, ".bigcommerce", "project.json"))
+  );
+  const projectUuid = projectJson.success ? projectJson.data.projectUuid : void 0;
+  const hasMiddleware = existsSync3(join5(cwd, "middleware.ts"));
+  const hasProxy = existsSync3(join5(cwd, "proxy.ts"));
+  const pkgJson = packageJsonSchema.safeParse(safeReadJson(join5(cwd, "package.json")));
+  const hasOpenNextDep = pkgJson.success ? Boolean(pkgJson.data.dependencies?.["@opennextjs/cloudflare"]) : false;
+  const isLinked = Boolean(projectUuid);
+  const isTransformed = hasMiddleware && !hasProxy && hasOpenNextDep;
+  const isFullySetUp = isLinked && isTransformed;
+  return {
+    projectUuid,
+    hasMiddleware,
+    hasProxy,
+    hasOpenNextDep,
+    isLinked,
+    isTransformed,
+    isFullySetUp
+  };
+}
+
+// src/cli/lib/required-build-env.ts
+var REQUIRED_BUILD_ENV_VARS = [
+  "BIGCOMMERCE_STORE_HASH",
+  "BIGCOMMERCE_STOREFRONT_TOKEN",
+  "BIGCOMMERCE_CHANNEL_ID",
+  "AUTH_SECRET"
+];
+var findMissingBuildEnv = (env2 = process.env) => {
+  return REQUIRED_BUILD_ENV_VARS.filter((name) => {
+    const value = env2[name];
+    return value === void 0 || value.trim() === "";
+  });
+};
+var assertRequiredBuildEnv = (env2 = process.env) => {
+  const missing = findMissingBuildEnv(env2);
+  if (missing.length === 0) {
+    return;
+  }
+  const missingList = missing.map((name) => `  - ${name}`).join("\n");
+  throw new UserActionableError(
+    `Missing required environment variable${missing.length === 1 ? "" : "s"} for the build:
+${missingList}
+
+These are read by the build itself, so they must be set before it runs. The build automatically loads \`.env.local\` and \`.env\` from the current directory (${process.cwd()}) \u2014 add the variables above to one of those files (\`.env.local\` takes precedence).
+To load an env file from a different location, pass \`--env-path <path>\` (for example \`--env-path ../.env.local\` when running from a subdirectory).`
+  );
+};
+
+// src/cli/lib/wrangler-config.ts
+function getCompatibilityDate(now = /* @__PURE__ */ new Date()) {
+  const date = new Date(now);
+  date.setUTCMonth(date.getUTCMonth() - 1);
+  return date.toISOString().slice(0, 10);
+}
+var LOCAL_ROUTES_KV_NAMESPACE_ID = "catalyst-routes-kv-local";
+function getWranglerConfig(projectUuid) {
+  return {
+    $schema: "node_modules/wrangler/config-schema.json",
+    main: "../.open-next/worker.js",
+    name: `project-${projectUuid}`,
+    compatibility_date: getCompatibilityDate(),
+    compatibility_flags: ["nodejs_compat", "global_fetch_strictly_public"],
+    observability: {
+      enabled: true,
+      head_sampling_rate: 0.05,
+      logs: {
+        enabled: true,
+        head_sampling_rate: 1,
+        invocation_logs: false
+      }
+    },
+    assets: {
+      directory: "../.open-next/assets",
+      binding: "ASSETS"
+    },
+    services: [
+      {
+        binding: "WORKER_SELF_REFERENCE",
+        service: `project-${projectUuid}`
+      }
+    ],
+    r2_buckets: [
+      {
+        binding: "NEXT_INC_CACHE_R2_BUCKET",
+        bucket_name: `project-${projectUuid}`
+      }
+    ],
+    kv_namespaces: [
+      {
+        binding: "CATALYST_ROUTES_KV",
+        id: LOCAL_ROUTES_KV_NAMESPACE_ID
+      }
+    ],
+    durable_objects: {
+      bindings: [
+        {
+          name: "NEXT_CACHE_DO_QUEUE",
+          class_name: "DOQueueHandler"
+        },
+        {
+          name: "NEXT_TAG_CACHE_DO_SHARDED",
+          class_name: "DOShardedTagCache"
+        },
+        {
+          name: "NEXT_CACHE_DO_PURGE",
+          class_name: "BucketCachePurge"
+        }
+      ]
+    },
+    migrations: [
+      {
+        tag: "v1",
+        new_sqlite_classes: ["DOQueueHandler", "DOShardedTagCache", "BucketCachePurge"]
+      }
+    ]
+  };
+}
+
+// src/cli/commands/build.ts
+var WRANGLER_VERSION = "4.128.0";
+var DIST_TAG_PATTERN = /^[a-zA-Z0-9][a-zA-Z0-9._-]*$/;
+var parseWranglerVersion = (value) => {
+  if (!validSemver(value) && !DIST_TAG_PATTERN.test(value)) {
+    throw new InvalidArgumentError(
+      `"${value}" is not a valid Wrangler version or dist-tag (e.g. 4.90.0 or latest).`
+    );
+  }
+  return value;
+};
+async function buildCatalystProject(projectUuid, wranglerVersion = WRANGLER_VERSION) {
+  assertRequiredBuildEnv();
+  const coreDir = process.cwd();
+  const projectPackageManager = await detectProjectPackageManager(coreDir);
+  if (await reconcileOpenNextVersion(coreDir, projectPackageManager, { canUpgrade: true })) {
+    await installDependencies(coreDir, projectPackageManager);
+  }
+  const openNextOutDir = join6(coreDir, ".open-next");
+  const bigcommerceDistDir = join6(coreDir, ".bigcommerce", "dist");
+  consola.start("Generating GraphQL types...");
+  await execa2("node", [join6(coreDir, "scripts", "generate.cjs")], {
+    stdio: "inherit",
+    cwd: coreDir
+  });
+  consola.success("GraphQL types generated");
+  const wranglerConfig = getWranglerConfig(projectUuid);
+  await rm(bigcommerceDistDir, { recursive: true, force: true });
+  consola.start("Copying templates...");
+  await copyFile(
+    join6(getModuleCliPath(), "templates", "open-next.config.ts"),
+    join6(coreDir, ".bigcommerce", "open-next.config.ts")
+  );
+  await writeFile(
+    join6(coreDir, ".bigcommerce", "wrangler.jsonc"),
+    JSON.stringify(wranglerConfig, null, 2)
+  );
   consola.success("Templates copied");
   consola.start("Building project...");
   await execa2(
@@ -1016,7 +1535,7 @@ async function buildCatalystProject(projectUuid, wranglerVersion = WRANGLER_VERS
       "build",
       "--skipWranglerConfigCheck",
       "--openNextConfigPath",
-      join4(coreDir, ".bigcommerce", "open-next.config.ts")
+      join6(coreDir, ".bigcommerce", "open-next.config.ts")
     ],
     {
       stdout: ["pipe", "inherit"],
@@ -1024,8 +1543,8 @@ async function buildCatalystProject(projectUuid, wranglerVersion = WRANGLER_VERS
     }
   );
   await copyFile(
-    join4(getModuleCliPath(), "templates", "public_headers"),
-    join4(openNextOutDir, "assets", "_headers")
+    join6(getModuleCliPath(), "templates", "public_headers"),
+    join6(openNextOutDir, "assets", "_headers")
   );
   await execa2(
     "pnpm",
@@ -1034,7 +1553,7 @@ async function buildCatalystProject(projectUuid, wranglerVersion = WRANGLER_VERS
       `wrangler@${wranglerVersion}`,
       "deploy",
       "--config",
-      join4(coreDir, ".bigcommerce", "wrangler.jsonc"),
+      join6(coreDir, ".bigcommerce", "wrangler.jsonc"),
       "--keep-vars",
       "--outdir",
       bigcommerceDistDir,
@@ -1046,7 +1565,7 @@ async function buildCatalystProject(projectUuid, wranglerVersion = WRANGLER_VERS
     }
   );
   consola.success("Project built");
-  await cp(join4(openNextOutDir, "assets"), join4(bigcommerceDistDir, "assets"), {
+  await cp(join6(openNextOutDir, "assets"), join6(bigcommerceDistDir, "assets"), {
     recursive: true,
     force: true
   });
@@ -1065,12 +1584,12 @@ Examples:
   # Build with a specific Wrangler version
   $ catalyst build --wrangler-version 4.24.3`
 ).addOption(
-  new Option2(
+  new Option3(
     "--project-uuid <uuid>",
     "Project UUID to be included in the deployment configuration."
   ).env("CATALYST_PROJECT_UUID")
 ).addOption(
-  new Option2(
+  new Option3(
     "--wrangler-version <version>",
     `Wrangler version or dist-tag to build with. Defaults to ${WRANGLER_VERSION}.`
   ).argParser(parseWranglerVersion)
@@ -1098,15 +1617,18 @@ Examples:
 });
 
 // src/cli/commands/channels.ts
-import { select as select4 } from "@inquirer/prompts";
-import { Command as Command3, InvalidArgumentError as InvalidArgumentError2, Option as Option3 } from "commander";
+import { confirm as confirm3, 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/channel-checkout-url-flow.ts
+import { input as input3 } from "@inquirer/prompts";
+
 // src/cli/lib/channel-site-flow.ts
 import { select as select2 } from "@inquirer/prompts";
 
 // src/cli/lib/channels.ts
-import { z as z7 } from "zod";
+import { z as z8 } from "zod";
 var cliApiUrl = (origin, storeHash, path) => `${origin}/stores/${storeHash}/cli-api/v3${path}`;
 var channelsUrl = (storeHash, apiHost, query2 = {}) => {
   const params = new URLSearchParams(query2).toString();
@@ -1117,14 +1639,14 @@ var authHeaders2 = (accessToken) => ({
   "X-Correlation-Id": getTelemetry().correlationId,
   Accept: "application/json"
 });
-var envVarsSchema = z7.record(z7.string(), z7.coerce.string());
-var channelSchema = z7.object({
-  id: z7.number(),
-  name: z7.string(),
-  platform: z7.string()
+var envVarsSchema = z8.record(z8.string(), z8.coerce.string());
+var channelSchema = z8.object({
+  id: z8.number(),
+  name: z8.string(),
+  platform: z8.string()
 });
-var channelsResponseSchema = z7.object({
-  data: z7.array(channelSchema)
+var channelsResponseSchema = z8.object({
+  data: z8.array(channelSchema)
 });
 var CHANNEL_PLATFORM_ORDER = ["catalyst", "next", "bigcommerce"];
 function sortChannelsByPlatform(channels2) {
@@ -1140,32 +1662,46 @@ function sortChannelsByPlatform(channels2) {
 function channelPlatformLabel(platform) {
   return platform === "bigcommerce" ? "Stencil" : platform.charAt(0).toUpperCase() + platform.slice(1);
 }
-var initResponseSchema = z7.object({
-  data: z7.object({
-    storefront_api_token: z7.string(),
+var initResponseSchema = z8.object({
+  data: z8.object({
+    storefront_api_token: z8.string(),
     envVars: envVarsSchema
   })
 });
-var createChannelResponseSchema = z7.object({
-  data: z7.object({
-    id: z7.number(),
-    storefront_api_token: z7.string(),
+var createChannelResponseSchema = z8.object({
+  data: z8.object({
+    id: z8.number(),
+    storefront_api_token: z8.string(),
     envVars: envVarsSchema
   })
 });
-var eligibilityResponseSchema = z7.object({
-  data: z7.object({
-    eligible: z7.boolean(),
-    message: z7.string()
+var eligibilityResponseSchema = z8.object({
+  data: z8.object({
+    eligible: z8.boolean(),
+    message: z8.string()
   })
 });
-var channelSiteSchema = z7.object({
-  data: z7.object({
-    id: z7.number(),
-    url: z7.string(),
-    channel_id: z7.number()
+var siteUrlSchema = z8.object({
+  url: z8.string(),
+  type: z8.string()
+});
+var channelSiteSchema = z8.object({
+  data: z8.object({
+    id: z8.number(),
+    url: z8.string(),
+    channel_id: z8.number(),
+    ssl_status: z8.string().nullable().optional(),
+    is_checkout_url_customized: z8.boolean().optional(),
+    urls: z8.array(siteUrlSchema).optional()
   })
 });
+function assertChannelSettingsAuthorized(response, action) {
+  if (response.status === 401 || response.status === 403) {
+    throw new UserActionableError(
+      `${action} (${response.status}). Re-run \`catalyst auth login\` to refresh your access token with the store_channel_settings and store_sites scopes.`
+    );
+  }
+}
 async function getChannelInit(channelId, storeHash, accessToken, origin) {
   const response = await fetch(cliApiUrl(origin, storeHash, `/channels/${channelId}/init`), {
     method: "GET",
@@ -1214,354 +1750,180 @@ async function fetchAvailableChannels(storeHash, accessToken, apiHost) {
   const response = await fetch(
     channelsUrl(storeHash, apiHost, { available: "true", type: "storefront" }),
     {
-      method: "GET",
-      headers: {
-        "X-Auth-Token": accessToken,
-        "X-Correlation-Id": getTelemetry().correlationId,
-        Accept: "application/json"
-      }
-    }
-  );
-  assertAuthorized(response);
-  if (!response.ok) {
-    throw await httpError(response, "Failed to fetch channels");
-  }
-  return channelsResponseSchema.parse(await response.json()).data;
-}
-async function updateChannelSiteUrl(channelId, siteUrl, storeHash, accessToken, apiHost) {
-  const response = await fetch(
-    `https://${apiHost}/stores/${storeHash}/v3/channels/${channelId}/site`,
-    {
-      method: "PUT",
-      headers: {
-        "X-Auth-Token": accessToken,
-        "Content-Type": "application/json",
-        Accept: "application/json",
-        "X-Correlation-Id": getTelemetry().correlationId
-      },
-      body: JSON.stringify({ url: siteUrl })
-    }
-  );
-  if (response.status === 401 || response.status === 403) {
-    throw new UserActionableError(
-      `Failed to update channel site (${response.status}). Re-run \`catalyst auth login\` to refresh your access token with the store_channel_settings scope.`
-    );
-  }
-  if (!response.ok) {
-    throw await httpError(response, "Failed to update channel site");
-  }
-  const res = await response.json();
-  const { data } = channelSiteSchema.parse(res);
-  return { id: data.id, url: data.url, channelId: data.channel_id };
-}
-
-// src/cli/lib/commerce-hosting.ts
-import { confirm as confirm2, input as input2, select, Separator } from "@inquirer/prompts";
-import { colorize as colorize3 } from "consola/utils";
-import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync2, unlinkSync, writeFileSync } from "fs";
-import { dirname as dirname2, join as join5 } from "path";
-import { z as z8 } from "zod";
-
-// src/cli/lib/sort-package-json.ts
-var FIELD_ORDER = [
-  "name",
-  "description",
-  "version",
-  "private",
-  "engines",
-  "scripts",
-  "dependencies",
-  "devDependencies"
-];
-function sortPackageJsonFields(pkg) {
-  const ordered = {};
-  FIELD_ORDER.forEach((field) => {
-    if (field in pkg) {
-      ordered[field] = pkg[field];
-    }
-  });
-  Object.keys(pkg).forEach((key) => {
-    if (!(key in ordered)) {
-      ordered[key] = pkg[key];
-    }
-  });
-  return ordered;
-}
-
-// src/cli/lib/commerce-hosting.ts
-var OPENNEXT_CLOUDFLARE_VERSION = "1.17.3";
-var corePackageJsonSchema = z8.looseObject({
-  dependencies: z8.record(z8.string(), z8.string()).optional()
-});
-var projectJsonSchema2 = z8.looseObject({});
-var readProjectJson = (path) => {
-  if (!existsSync3(path)) return {};
-  try {
-    const parsed = projectJsonSchema2.safeParse(JSON.parse(readFileSync2(path, "utf-8")));
-    return parsed.success ? parsed.data : {};
-  } catch {
-    return {};
-  }
-};
-var writeJson = (path, value) => {
-  mkdirSync(dirname2(path), { recursive: true });
-  writeFileSync(path, `${JSON.stringify(value, null, 2)}
-`);
-};
-var convertProxyToMiddleware = (projectDir) => {
-  const proxyPath = join5(projectDir, "proxy.ts");
-  const middlewarePath = join5(projectDir, "middleware.ts");
-  if (!existsSync3(proxyPath)) return;
-  const contents = readFileSync2(proxyPath, "utf-8").replace("export const proxy", "export const middleware").replace("export const config = {", "export const config = {\n  runtime: 'experimental-edge',");
-  writeFileSync(middlewarePath, contents);
-  unlinkSync(proxyPath);
-};
-var cleanupCloudflareIncompatibilities = async (projectDir) => {
-  const instrumentationPath = join5(projectDir, "instrumentation.ts");
-  if (!existsSync3(instrumentationPath)) return;
-  if (!process.stdin.isTTY) {
-    consola.warn(
-      "instrumentation.ts is present and may be incompatible with the Cloudflare Workers bundle (the default @vercel/otel scaffolding throws at cold start under workerd). Skipping automatic cleanup in non-interactive mode \u2014 re-run interactively to remove it, or delete/gate it manually."
-    );
-    return;
-  }
-  const shouldRemove = await confirm2({
-    message: 'Catalyst found instrumentation.ts, which is incompatible with the Cloudflare Workers bundle when it uses @vercel/otel (causes "Failed to prepare server" at cold start). Remove it and drop @vercel/otel from package.json?',
-    default: true
-  });
-  if (!shouldRemove) {
-    consola.info(
-      'Leaving instrumentation.ts in place. The Cloudflare worker will continue to log "Failed to prepare server" at cold start until this is resolved manually.'
-    );
-    return;
-  }
-  unlinkSync(instrumentationPath);
-  consola.info("Removed instrumentation.ts (incompatible with Cloudflare Workers).");
-  const corePackageJsonPath = join5(projectDir, "package.json");
-  if (existsSync3(corePackageJsonPath)) {
-    const pkg = corePackageJsonSchema.parse(JSON.parse(readFileSync2(corePackageJsonPath, "utf-8")));
-    if (pkg.dependencies && "@vercel/otel" in pkg.dependencies) {
-      const { "@vercel/otel": _removedVercelOtel, ...preservedDeps } = pkg.dependencies;
-      pkg.dependencies = preservedDeps;
-      writeJson(corePackageJsonPath, sortPackageJsonFields(pkg));
-      consola.info("Dropped @vercel/otel from package.json.");
-    }
-  }
-};
-var setupCommerceHosting = async ({
-  projectDir,
-  projectUuid,
-  storeHash,
-  accessToken
-}) => {
-  await cleanupCloudflareIncompatibilities(projectDir);
-  const corePackageJsonPath = join5(projectDir, "package.json");
-  const pkg = corePackageJsonSchema.parse(JSON.parse(readFileSync2(corePackageJsonPath, "utf-8")));
-  pkg.dependencies = {
-    ...pkg.dependencies,
-    "@opennextjs/cloudflare": OPENNEXT_CLOUDFLARE_VERSION
-  };
-  writeJson(corePackageJsonPath, sortPackageJsonFields(pkg));
-  const projectJsonPath = join5(projectDir, ".bigcommerce", "project.json");
-  const projectJson = {
-    ...readProjectJson(projectJsonPath),
-    projectUuid,
-    framework: "catalyst"
-  };
-  if (storeHash) projectJson.storeHash = storeHash;
-  if (accessToken) projectJson.accessToken = accessToken;
-  writeJson(projectJsonPath, projectJson);
-  convertProxyToMiddleware(projectDir);
-};
-var NoLinkedProjectError = class extends Error {
-  constructor() {
-    super("No infrastructure project linked: user declined to create one.");
-    this.name = "NoLinkedProjectError";
-  }
-};
-async function promptForNewProjectName(api) {
-  const newProjectName = await input2({ message: "Enter a name for the new project:" });
-  const data = await createProject(newProjectName, api.storeHash, api.accessToken, api.apiHost);
-  consola.success(`Project "${data.name}" created successfully.`);
-  return { uuid: data.uuid, name: data.name, deployment_hostnames: [] };
-}
-async function selectOrCreateInfrastructureProject(api, linkedProjectUuid) {
-  consola.start("Fetching projects...");
-  const existingProjects = await fetchProjects(api.storeHash, api.accessToken, api.apiHost);
-  consola.success("Projects fetched.");
-  if (existingProjects.length === 0) {
-    const shouldCreate = await confirm2({
-      message: "There are not any hosting projects that you can link to yet. Would you like to create one?",
-      default: true
-    });
-    if (!shouldCreate) {
-      throw new NoLinkedProjectError();
+      method: "GET",
+      headers: {
+        "X-Auth-Token": accessToken,
+        "X-Correlation-Id": getTelemetry().correlationId,
+        Accept: "application/json"
+      }
     }
-    return promptForNewProjectName(api);
+  );
+  assertAuthorized(response);
+  if (!response.ok) {
+    throw await httpError(response, "Failed to fetch channels");
   }
-  const choices = [
-    ...existingProjects.map((p) => ({
-      name: p.uuid === linkedProjectUuid ? `${p.name} ${colorize3("green", "[linked]")}` : p.name,
-      value: p.uuid,
-      description: p.uuid
-    })),
+  return channelsResponseSchema.parse(await response.json()).data;
+}
+async function updateChannelSiteUrl(channelId, siteUrl, storeHash, accessToken, apiHost) {
+  const response = await fetch(
+    `https://${apiHost}/stores/${storeHash}/v3/channels/${channelId}/site`,
     {
-      name: "Create a new project",
-      value: "create",
-      description: "Create a new hosting project for this Catalyst storefront."
+      method: "PUT",
+      headers: {
+        "X-Auth-Token": accessToken,
+        "Content-Type": "application/json",
+        Accept: "application/json",
+        "X-Correlation-Id": getTelemetry().correlationId
+      },
+      body: JSON.stringify({ url: siteUrl })
     }
-  ];
-  const selected = await select({
-    message: "Select a project or create a new project (Press <enter> to select).",
-    choices
-  });
-  if (selected === "create") {
-    return promptForNewProjectName(api);
-  }
-  const matched = existingProjects.find((p) => p.uuid === selected);
-  if (!matched) {
-    throw new Error(`Selected project ${String(selected)} not found in fetched list.`);
+  );
+  assertChannelSettingsAuthorized(response, "Failed to update channel site");
+  if (!response.ok) {
+    throw await httpError(response, "Failed to update channel site");
   }
-  return matched;
+  const res = await response.json();
+  const { data } = channelSiteSchema.parse(res);
+  return { id: data.id, url: data.url, channelId: data.channel_id };
 }
-async function promptForCommerceHostingProject(api, defaultName, autoUseDefaultName, useExistingOnCollision) {
-  const existingProjects = await fetchProjects(api.storeHash, api.accessToken, api.apiHost);
-  const takenNames = existingProjects.map((project) => project.name);
-  if (autoUseDefaultName) {
-    return autoCreateCommerceHostingProject(
-      api,
-      defaultName,
-      existingProjects,
-      useExistingOnCollision
-    );
-  }
-  const conflict = existingProjects.find(
-    (project) => project.name.toLowerCase() === defaultName.toLowerCase()
+var toChannelSiteDetails = (data) => ({
+  id: data.id,
+  url: data.url,
+  channelId: data.channel_id,
+  sslStatus: data.ssl_status ?? null,
+  isCheckoutUrlCustomized: data.is_checkout_url_customized ?? false,
+  urls: data.urls ?? []
+});
+function findChannelSiteUrl(site, type) {
+  return site.urls.find((entry) => entry.type === type)?.url;
+}
+async function getChannelSite(channelId, storeHash, accessToken, apiHost) {
+  const response = await fetch(
+    `https://${apiHost}/stores/${storeHash}/v3/channels/${channelId}/site`,
+    { method: "GET", headers: authHeaders2(accessToken) }
   );
-  if (!conflict) {
-    return autoCreateCommerceHostingProject(
-      api,
-      defaultName,
-      existingProjects,
-      useExistingOnCollision
-    );
-  }
-  const hasOtherProjects = existingProjects.length > 1;
-  const choices = [
-    { name: `Use "${conflict.name}"`, value: "use-named" }
-  ];
-  if (hasOtherProjects) {
-    choices.push({ name: "Select from my projects", value: "select-from-list" });
+  assertChannelSettingsAuthorized(response, "Failed to fetch channel site");
+  if (!response.ok) {
+    throw await httpError(response, "Failed to fetch channel site");
   }
-  choices.push({ name: "Create a new project", value: "create" });
-  const action = await select({
-    message: hasOtherProjects ? `It looks like you already have an existing Commerce Hosting project named "${conflict.name}". Would you like to use it, select from your projects, or create a new one?` : `It looks like you already have an existing Commerce Hosting project named "${conflict.name}". Would you like to use it, or create a new one?`,
-    choices
+  const res = await response.json();
+  return toChannelSiteDetails(channelSiteSchema.parse(res).data);
+}
+var checkoutUrlPath = (storeHash, apiHost, channelId) => `https://${apiHost}/stores/${storeHash}/v3/channels/${channelId}/site/checkout-url`;
+async function updateChannelCheckoutUrl(channelId, checkoutUrl, storeHash, accessToken, apiHost) {
+  const response = await fetch(checkoutUrlPath(storeHash, apiHost, channelId), {
+    method: "PUT",
+    headers: { ...authHeaders2(accessToken), "Content-Type": "application/json" },
+    body: JSON.stringify({ url: checkoutUrl })
   });
-  if (action === "use-named") {
-    consola.success(`Using existing Commerce Hosting project "${conflict.name}"`);
-    return conflict;
-  }
-  if (action === "create") {
-    return promptAndCreateCommerceHostingProject(api, takenNames, defaultName);
+  assertChannelSettingsAuthorized(response, "Failed to update channel checkout URL");
+  if (!response.ok) {
+    throw await httpError(response, "Failed to update channel checkout URL");
   }
-  const selected = await select({
-    message: "Which Commerce Hosting project would you like to use?",
-    choices: [
-      ...existingProjects.map((project) => ({
-        name: project.name,
-        value: project,
-        description: project.uuid
-      })),
-      new Separator(),
-      { name: "Create a new project", value: "create-new" }
-    ]
+  const res = await response.json();
+  return toChannelSiteDetails(channelSiteSchema.parse(res).data);
+}
+async function deleteChannelCheckoutUrl(channelId, storeHash, accessToken, apiHost) {
+  const response = await fetch(checkoutUrlPath(storeHash, apiHost, channelId), {
+    method: "DELETE",
+    headers: authHeaders2(accessToken)
   });
-  if (selected === "create-new") {
-    return promptAndCreateCommerceHostingProject(api, takenNames, defaultName);
+  assertChannelSettingsAuthorized(response, "Failed to remove channel checkout URL");
+  if (!response.ok) {
+    throw await httpError(response, "Failed to remove channel checkout URL");
   }
-  consola.success(`Using existing Commerce Hosting project "${selected.name}"`);
-  return selected;
 }
-async function promptAndCreateCommerceHostingProject(api, takenNames, defaultName) {
-  const projectName = await input2({
-    message: "What would you like to name your Commerce Hosting project?",
-    default: defaultName,
-    validate: (value) => {
-      const trimmed = value.trim();
-      if (!trimmed) return "Project name is required";
-      const conflict = takenNames.find((taken) => taken.toLowerCase() === trimmed.toLowerCase());
-      if (conflict) {
-        return `A Commerce Hosting project named "${conflict}" already exists`;
-      }
-      return true;
-    },
-    theme: {
-      style: {
-        help: () => colorize3(
-          "dim",
-          "(The project that hosts your storefront on Commerce \u2014 often matches your folder name.)"
-        )
-      }
-    }
-  });
+
+// 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 {
-    const created = await createProject(
-      projectName.trim(),
-      api.storeHash,
-      api.accessToken,
-      api.apiHost
+    return new URL(url).hostname;
+  } catch {
+    return void 0;
+  }
+}
+function sharesMainDomain(a, b) {
+  const first = getDomain(normalizeHostname(a));
+  return first !== null && first === getDomain(normalizeHostname(b));
+}
+function suggestCheckoutUrl(storefrontUrl) {
+  const host = hostnameOf(storefrontUrl);
+  if (!host) return void 0;
+  const base = normalizeHostname(host).replace(/^www\./, "");
+  return `https://checkout.${base}`;
+}
+function normalizeCheckoutUrl(value) {
+  const withScheme = /^[a-z][a-z\d+.-]*:\/\//i.test(value) ? value : `https://${value}`;
+  let parsed;
+  try {
+    parsed = new URL(withScheme);
+  } catch {
+    throw new UserActionableError(
+      `"${value}" is not a valid URL. Pass a hostname or an https URL, e.g. https://checkout.example.com.`
+    );
+  }
+  if (parsed.protocol !== "https:") {
+    throw new UserActionableError(
+      `The checkout URL must use https, but "${value}" uses ${parsed.protocol.replace(":", "")}.`
     );
-    consola.success(`Commerce Hosting project "${created.name}" created successfully`);
-    return { uuid: created.uuid, name: created.name, deployment_hostnames: [] };
-  } catch (error) {
-    if (error instanceof InfrastructureProjectValidationError) {
-      consola.error(error.message);
-      return promptAndCreateCommerceHostingProject(api, takenNames, defaultName);
-    }
-    throw error;
   }
+  return parsed.origin;
 }
-async function resolveCollisionChoice(existingName, useExistingOnCollision) {
-  if (useExistingOnCollision === true) return true;
-  if (!process.stdin.isTTY) return false;
-  return select({
-    message: `A Commerce Hosting project named "${existingName}" already exists. Use the existing project?`,
-    choices: [
-      { name: "Yes", value: true },
-      { name: "No", value: false }
-    ]
-  });
+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;
+  }
 }
-async function autoCreateCommerceHostingProject(api, name, existingProjects, useExistingOnCollision) {
-  const existing = existingProjects.find(
-    (project) => project.name.toLowerCase() === name.toLowerCase()
+async function warnOnCrossDomainCheckout(site, context) {
+  const storefrontUrl = findChannelSiteUrl(site, "primary") ?? site.url;
+  const storefrontHost = hostnameOf(storefrontUrl);
+  const checkoutUrl = findChannelSiteUrl(site, "checkout");
+  if (!storefrontHost) return { crossDomain: false };
+  const suggestion = suggestCheckoutUrl(storefrontUrl);
+  const checkoutHost = checkoutUrl ? hostnameOf(checkoutUrl) : void 0;
+  if (!checkoutHost || sharesMainDomain(storefrontHost, checkoutHost)) {
+    return { crossDomain: false, suggestion };
+  }
+  if (site.isCheckoutUrlCustomized) {
+    consola.warn(
+      `This channel's checkout URL (${checkoutHost}) is on a different domain than its storefront (${storefrontHost}) \u2014 most likely a storefront URL change left it behind.`
+    );
+  } else {
+    consola.warn(
+      `Checkout is on the default channel's domain (${checkoutHost}), not this channel's storefront (${storefrontHost}).`
+    );
+  }
+  consola.info(
+    "Shopper sessions and carts may not carry into checkout in browsers that restrict cross-domain cookies."
   );
-  if (existing) {
-    const shouldUseExisting = await resolveCollisionChoice(existing.name, useExistingOnCollision);
-    if (shouldUseExisting) {
-      consola.success(`Using existing Commerce Hosting project "${existing.name}"`);
-      return existing;
-    }
-    consola.error(
-      "Not reusing the existing project. Re-run with a different --project-name, or pass --use-existing to reuse it."
+  const storefrontOnManagedZone = await isManagedHostingHostname(storefrontHost, context);
+  const report = { crossDomain: true, storefrontOnManagedZone, suggestion };
+  if (storefrontOnManagedZone === false) {
+    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.`
     );
-    process.exit(1);
+    return report;
   }
-  try {
-    const created = await createProject(name, api.storeHash, api.accessToken, api.apiHost);
-    consola.success(`Commerce Hosting project "${created.name}" created successfully`);
-    return { uuid: created.uuid, name: created.name, deployment_hostnames: [] };
-  } catch (error) {
-    if (error instanceof InfrastructureProjectValidationError) {
-      consola.error(
-        `Failed to create Commerce Hosting project "${name}": ${error.message}
-Re-run with a different --project-name.`
-      );
-      process.exit(1);
-    }
-    throw error;
+  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\`.`
+    );
+    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."
+  );
+  return report;
 }
 
 // src/cli/lib/channel-site-flow.ts
@@ -1599,7 +1961,7 @@ async function resolveChannel(options) {
     );
   }
   const id = await select2({
-    message: "Select the channel to update.",
+    message: options.message ?? "Select the channel to update.",
     choices: catalystChannels.map((c) => ({
       name: c.name,
       value: c.id,
@@ -1618,34 +1980,91 @@ async function resolveHostname(project, options) {
       `Project "${project.name}" has no deployment hostnames yet. Run \`catalyst deploy\` first to create one.`
     );
   }
-  const ordered = options.preferHostname ? [
-    ...project.deployment_hostnames.filter((h) => h === options.preferHostname),
-    ...project.deployment_hostnames.filter((h) => h !== options.preferHostname)
-  ] : project.deployment_hostnames;
-  const selected = await select2({
-    message: "Select the hostname to point the channel at.",
-    choices: ordered.map((h) => ({ name: h, value: h }))
+  const ordered = options.preferHostname ? [
+    ...project.deployment_hostnames.filter((h) => h === options.preferHostname),
+    ...project.deployment_hostnames.filter((h) => h !== options.preferHostname)
+  ] : project.deployment_hostnames;
+  const selected = await select2({
+    message: "Select the hostname to point the channel at.",
+    choices: ordered.map((h) => ({ name: h, value: h }))
+  });
+  return selected;
+}
+async function runChannelSiteUrlFlow(options) {
+  const project = await resolveProject(options);
+  const channel = await resolveChannel(options);
+  const hostname = await resolveHostname(project, options);
+  const siteUrl = hostname.startsWith("https://") ? hostname : `https://${hostname}`;
+  await updateChannelSiteUrl(
+    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}.`);
+  try {
+    const site = await getChannelSite(
+      channel.id,
+      options.storeHash,
+      options.accessToken,
+      options.apiHost
+    );
+    const report = await warnOnCrossDomainCheckout(site, {
+      storeHash: options.storeHash,
+      accessToken: options.accessToken,
+      apiHost: options.apiHost
+    });
+    if (report.crossDomain && report.storefrontOnManagedZone !== true) {
+      consola.info("Set a checkout URL for this channel with:");
+      consola.log(
+        `  catalyst channels update --channel-id ${channel.id} --checkout-url ${report.suggestion ?? "<domain>"}`
+      );
+    }
+  } catch {
+  }
+  return { channelId: channel.id };
+}
+
+// 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);
+  let storefrontUrl = options.storefrontUrl;
+  if (!storefrontUrl) {
+    const site = await getChannelSite(
+      channel.id,
+      options.storeHash,
+      options.accessToken,
+      options.apiHost
+    );
+    storefrontUrl = findChannelSiteUrl(site, "primary") ?? site.url;
+    const currentCheckoutUrl = findChannelSiteUrl(site, "checkout");
+    consola.info(`Channel ${label} storefront is ${storefrontUrl}.`);
+    if (currentCheckoutUrl) {
+      consola.info(
+        `Checkout is currently ${currentCheckoutUrl}${site.isCheckoutUrlCustomized ? "" : ", inherited from the default channel"}.`
+      );
+    }
+  }
+  const answer = options.url ?? await input3({
+    message: "Checkout URL for this channel (must share a main domain with the storefront)",
+    default: suggestCheckoutUrl(storefrontUrl)
   });
-  return selected;
-}
-async function runChannelSiteUrlFlow(options) {
-  const project = await resolveProject(options);
-  const channel = await resolveChannel(options);
-  const hostname = await resolveHostname(project, options);
-  const siteUrl = hostname.startsWith("https://") ? hostname : `https://${hostname}`;
-  await updateChannelSiteUrl(
+  const checkoutUrl = normalizeCheckoutUrl(answer);
+  await updateChannelCheckoutUrl(
     channel.id,
-    siteUrl,
+    checkoutUrl,
     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}.`);
+  consola.success(`Updated channel ${label} checkout URL to ${checkoutUrl}.`);
 }
 
 // src/cli/lib/create-channel-flow.ts
-import { checkbox, input as input3, select as select3 } from "@inquirer/prompts";
+import { checkbox, input as input4, select as select3 } from "@inquirer/prompts";
 import { colorize as colorize4 } from "consola/utils";
 
 // src/cli/lib/localization.ts
@@ -1720,7 +2139,7 @@ async function runCreateChannelFlow(options) {
       throw new UserActionableError(nameError);
     }
   }
-  const name = options.name ?? await input3({
+  const name = options.name ?? await input4({
     message: "What would you like to name your new channel?",
     validate: (value) => getChannelNameError(value) ?? true
   });
@@ -1781,15 +2200,15 @@ async function runCreateChannelFlow(options) {
 
 // src/cli/lib/env-config.ts
 var ENV_KEY_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
-var parseEnvAssignment = (input6) => {
-  const separatorIndex = input6.indexOf("=");
+var parseEnvAssignment = (input7) => {
+  const separatorIndex = input7.indexOf("=");
   if (separatorIndex === -1) {
-    throw new Error(`Invalid env var format: ${input6}. Expected format: KEY=VALUE`);
+    throw new Error(`Invalid env var format: ${input7}. Expected format: KEY=VALUE`);
   }
-  const key = input6.slice(0, separatorIndex).trim();
-  const value = input6.slice(separatorIndex + 1).trim();
+  const key = input7.slice(0, separatorIndex).trim();
+  const value = input7.slice(separatorIndex + 1).trim();
   if (!key || !value) {
-    throw new Error(`Invalid env var format: ${input6}. Expected format: KEY=VALUE`);
+    throw new Error(`Invalid env var format: ${input7}. Expected format: KEY=VALUE`);
   }
   if (!ENV_KEY_PATTERN.test(key)) {
     throw new Error(
@@ -1829,7 +2248,7 @@ function resolveCredentials(options, config2) {
 // src/cli/lib/write-env.ts
 import { outputFileSync } from "fs-extra/esm";
 import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 var ACTIVE_KEY_LINE = /^([A-Za-z_][A-Za-z0-9_]*)=(.*)$/;
 var keyFromLine = (line) => {
   const match = ACTIVE_KEY_LINE.exec(line);
@@ -1846,8 +2265,8 @@ var parseEnvValues = (contents) => {
   return values;
 };
 var writeEnv = (projectDir, envVars) => {
-  const examplePath = join6(projectDir, ".env.example");
-  const localPath = join6(projectDir, ".env.local");
+  const examplePath = join7(projectDir, ".env.example");
+  const localPath = join7(projectDir, ".env.local");
   const existingLocal = existsSync4(localPath) ? parseEnvValues(readFileSync3(localPath, "utf-8")) : /* @__PURE__ */ new Map();
   const resolve2 = (key) => {
     if (key in envVars && envVars[key] !== "") {
@@ -1901,6 +2320,22 @@ var parseChannelId = (value) => {
   }
   return parsed;
 };
+var parseCheckoutUrl = (value) => {
+  try {
+    return normalizeCheckoutUrl(value);
+  } catch (error) {
+    throw new InvalidArgumentError2(error instanceof Error ? error.message : String(error));
+  }
+};
+var CHECKOUT_URL_NOTES = `
+Checkout is hosted by BigCommerce, so a checkout URL must be a domain you have
+pointed at BigCommerce with a certificate provisioned there \u2014 not one added with
+\`catalyst domains add\`, which only routes traffic to this project.
+
+BigCommerce also requires the checkout URL to share a main domain with the
+channel's storefront URL, so that sessions carry between the two. This means a
+custom checkout URL is only possible on a custom storefront domain; channels on
+an auto-generated deployment hostname use the shared checkout domain.`;
 async function resolveCredentialsWithLogin(options, config2, apiHost) {
   const storeHash = options.storeHash ?? config2.get("storeHash");
   const accessToken = options.accessToken ?? config2.get("accessToken");
@@ -1919,50 +2354,101 @@ async function resolveCredentialsWithLogin(options, config2, apiHost) {
     throw error;
   }
 }
-var update = new Command3("update").configureHelp({ showGlobalOptions: true }).description(
-  "Update a BigCommerce channel's site URL to point at one of your project's deployment hostnames."
-).addHelpText(
+var update = new Command3("update").configureHelp({ showGlobalOptions: true }).description("Update a BigCommerce channel's storefront and checkout URLs.").addHelpText(
   "after",
-  `
+  `${CHECKOUT_URL_NOTES}
+
+With no flags, this updates the storefront URL and prompts for the hostname.
+Pass a checkout flag on its own to change only the checkout URL, leaving the
+storefront URL alone.
+
 Examples:
   # Pick a channel and hostname interactively
   $ catalyst channels update
 
-  # Skip both prompts
-  $ catalyst channels update --channel-id 123 --hostname my-storefront.example.com`
+  # Point the storefront at a deployment hostname
+  $ catalyst channels update --channel-id 123 --hostname my-storefront.example.com
+
+  # Set both at once
+  $ catalyst channels update --channel-id 123 --hostname my-storefront.example.com --checkout-url checkout.example.com
+
+  # Change only the checkout URL
+  $ catalyst channels update --channel-id 123 --checkout-url checkout.example.com
+
+  # Fall back to the shared checkout domain
+  $ catalyst channels update --channel-id 123 --remove-checkout-url`
 ).addOption(storeHashOption()).addOption(accessTokenOption()).addOption(apiHostOption()).addOption(projectUuidOption()).addOption(
-  new Option3(
+  new Option4(
     "--channel-id <id>",
     "Skip the channel prompt and target this channel directly."
   ).argParser((value) => Number(value))
 ).addOption(
-  new Option3(
+  new Option4(
     "--hostname <hostname>",
     "Skip the hostname prompt and use this hostname directly. Must be one of the project's deployment_hostnames."
   )
+).addOption(
+  new Option4(
+    "--checkout-url <url>",
+    "Set the channel's checkout URL. Must share a main domain with the storefront URL."
+  ).argParser(parseCheckoutUrl)
+).addOption(
+  new Option4(
+    "--remove-checkout-url",
+    "Remove the channel's custom checkout URL so checkout falls back to the shared checkout domain."
+  ).conflicts("checkoutUrl")
 ).action(async (options) => {
   const config2 = getProjectConfig();
   const apiHost = resolveApiHost(options, config2);
   const { storeHash, accessToken } = resolveCredentials(options, config2);
   await getTelemetry().identify(storeHash);
-  try {
-    await runChannelSiteUrlFlow({
-      storeHash,
-      accessToken,
-      apiHost,
-      projectUuid: options.projectUuid ?? config2.get("projectUuid"),
-      channelId: options.channelId,
-      hostname: options.hostname
-    });
-  } catch (error) {
-    if (error instanceof NoLinkedProjectError) {
-      consola.info(
-        "When you're ready to create a project, run `catalyst projects create` or re-run `catalyst channels update`."
+  const touchesCheckout = options.checkoutUrl !== void 0 || options.removeCheckoutUrl === true;
+  const updatesSiteUrl = options.hostname !== void 0 || !touchesCheckout;
+  let channelId = options.channelId;
+  if (updatesSiteUrl) {
+    try {
+      ({ channelId } = await runChannelSiteUrlFlow({
+        storeHash,
+        accessToken,
+        apiHost,
+        projectUuid: options.projectUuid ?? config2.get("projectUuid"),
+        channelId: options.channelId,
+        hostname: options.hostname
+      }));
+    } catch (error) {
+      if (error instanceof NoLinkedProjectError) {
+        consola.info(
+          "When you're ready to create a project, run `catalyst projects create` or re-run `catalyst channels update`."
+        );
+        process.exit(0);
+        return;
+      }
+      throw error;
+    }
+  }
+  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);
+    if (options.checkoutUrl !== void 0) {
+      const updated = await updateChannelCheckoutUrl(
+        channel.id,
+        options.checkoutUrl,
+        storeHash,
+        accessToken,
+        apiHost
       );
-      process.exit(0);
-      return;
+      consola.success(`Updated channel ${label} checkout URL to ${options.checkoutUrl}.`);
+      reportChannelSite(updated);
+      await warnOnCrossDomainCheckout(updated, { storeHash, accessToken, apiHost });
+    } else {
+      await deleteChannelCheckoutUrl(channel.id, storeHash, accessToken, apiHost);
+      consola.success(
+        `Removed the custom checkout URL from channel ${label}. Checkout now uses the shared checkout domain.`
+      );
+      const reverted = await getChannelSite(channel.id, storeHash, accessToken, apiHost);
+      reportChannelSite(reverted);
+      await warnOnCrossDomainCheckout(reverted, { storeHash, accessToken, apiHost });
     }
-    throw error;
   }
   process.exit(0);
 });
@@ -1981,14 +2467,14 @@ Examples:
   # Append extra environment variables to .env.local
   $ catalyst channels link --channel-id 123 --env MY_FLAG=1`
 ).addOption(storeHashOption()).addOption(accessTokenOption()).addOption(apiHostOption()).addOption(loginUrlOption()).addOption(
-  new Option3("--channel-id <id>", "Link this channel directly, skipping the picker.").argParser(
+  new Option4("--channel-id <id>", "Link this channel directly, skipping the picker.").argParser(
     parseChannelId
   )
 ).option(
   "--env <vars...>",
   "Arbitrary environment variables to set in .env.local. Format: KEY=VALUE (repeatable)."
 ).addOption(
-  new Option3("--cli-api-origin <origin>", "Catalyst CLI API origin").default("https://cxm-prd.bigcommerceapp.com").hideHelp()
+  new Option4("--cli-api-origin <origin>", "Catalyst CLI API origin").default("https://cxm-prd.bigcommerceapp.com").hideHelp()
 ).action(async (options) => {
   const config2 = getProjectConfig();
   const apiHost = resolveApiHost(options, config2);
@@ -2059,11 +2545,11 @@ Examples:
 ).option(
   "--additional-locales <locales...>",
   "Additional storefront locales, max 4 (e.g. --additional-locales es fr). Skips the additional-languages prompt."
-).addOption(new Option3("--sample-data", "Install sample data on the new channel.")).addOption(new Option3("--no-sample-data", "Create the channel without sample data.")).option(
+).addOption(new Option4("--sample-data", "Install sample data on the new channel.")).addOption(new Option4("--no-sample-data", "Create the channel without sample data.")).option(
   "--link",
   "Link the new channel to this project \u2014 write its credentials to .env.local without prompting."
 ).addOption(
-  new Option3("--cli-api-origin <origin>", "Catalyst CLI API origin").default("https://cxm-prd.bigcommerceapp.com").hideHelp()
+  new Option4("--cli-api-origin <origin>", "Catalyst CLI API origin").default("https://cxm-prd.bigcommerceapp.com").hideHelp()
 ).action(async (options) => {
   if (options.additionalLocales && options.additionalLocales.length > 4) {
     consola.error("You can only set up to 4 additional locales.");
@@ -2120,56 +2606,110 @@ Examples:
   }
   process.exit(0);
 });
-var channels = new Command3("channels").alias("channel").configureHelp({ showGlobalOptions: true }).description("Manage BigCommerce channels.").addCommand(create).addCommand(link).addCommand(update);
+var CHECKOUT_LABEL_WIDTH = "Storefront".length;
+var row = (label, value) => `  ${label.padEnd(CHECKOUT_LABEL_WIDTH)}  ${value}`;
+function reportChannelSite(site) {
+  const canonical = findChannelSiteUrl(site, "canonical");
+  const checkout = findChannelSiteUrl(site, "checkout");
+  consola.log(row("Storefront", findChannelSiteUrl(site, "primary") ?? site.url));
+  if (canonical) {
+    consola.log(row("Canonical", canonical));
+  }
+  consola.log(row("Checkout", checkout ?? "(none)"));
+  if (!site.isCheckoutUrlCustomized) {
+    consola.info(
+      "This channel has no checkout URL of its own, so checkout uses the default channel's primary URL."
+    );
+  }
+}
+async function resolveChannelTarget(options) {
+  const config2 = getProjectConfig();
+  const apiHost = resolveApiHost(options, config2);
+  const { storeHash, accessToken } = resolveCredentials(options, config2);
+  await getTelemetry().identify(storeHash);
+  const channel = await resolveChannel({
+    storeHash,
+    accessToken,
+    apiHost,
+    channelId: options.channelId,
+    // Read-only: these commands report on a channel, so the picker must not
+    // say "to update" — the shared default is written for `channels update`.
+    message: "Select a channel."
+  });
+  return {
+    config: config2,
+    apiHost,
+    storeHash,
+    accessToken,
+    channel,
+    label: channel.name ? `"${channel.name}" (${channel.id})` : String(channel.id)
+  };
+}
+var info = new Command3("info").configureHelp({ showGlobalOptions: true }).description("Show a channel's site URLs \u2014 storefront, canonical and checkout.").addHelpText(
+  "after",
+  `${CHECKOUT_URL_NOTES}
+
+Examples:
+  # Pick a channel interactively; the same as bare \`catalyst channels\`
+  $ catalyst channels info
+
+  # Target a channel directly
+  $ catalyst channels info --channel-id 123`
+).addOption(storeHashOption()).addOption(accessTokenOption()).addOption(apiHostOption()).addOption(
+  new Option4(
+    "--channel-id <id>",
+    "Skip the channel prompt and target this channel directly."
+  ).argParser(parseChannelId)
+).action(async (options) => {
+  const { apiHost, storeHash, accessToken, channel, label } = await resolveChannelTarget(options);
+  consola.start("Fetching channel site...");
+  const site = await getChannelSite(channel.id, storeHash, accessToken, apiHost);
+  consola.success(`Channel ${label}:`);
+  reportChannelSite(site);
+  const report = await warnOnCrossDomainCheckout(site, { storeHash, accessToken, apiHost });
+  if (report.crossDomain && report.storefrontOnManagedZone !== true) {
+    const suggested = report.suggestion ?? "<domain>";
+    if (!process.stdin.isTTY) {
+      consola.info(
+        `Set one with \`catalyst channels update --channel-id ${channel.id} --checkout-url ${suggested}\`.`
+      );
+      process.exit(0);
+      return;
+    }
+    const shouldSet = await confirm3({
+      message: "Set a checkout URL for this channel now?",
+      default: true
+    });
+    if (shouldSet) {
+      await runChannelCheckoutUrlFlow({
+        storeHash,
+        accessToken,
+        apiHost,
+        // Already chosen above; don't ask again.
+        channelId: channel.id,
+        channelName: channel.name,
+        storefrontUrl: findChannelSiteUrl(site, "primary") ?? site.url
+      });
+      process.exit(0);
+      return;
+    }
+    consola.info(
+      `When you're ready, run \`catalyst channels update --channel-id ${channel.id} --checkout-url <domain>\`.`
+    );
+  }
+  process.exit(0);
+});
+var channels = new Command3("channels").alias("channel").configureHelp({ showGlobalOptions: true }).description("Manage BigCommerce channels.").addCommand(info, { isDefault: true }).addCommand(create).addCommand(link).addCommand(update);
 
 // src/cli/commands/create.ts
-import { Command as Command4, InvalidArgumentError as InvalidArgumentError3, Option as Option4 } from "@commander-js/extra-typings";
-import { input as input4, select as select5 } from "@inquirer/prompts";
+import { Command as Command4, InvalidArgumentError as InvalidArgumentError3, Option as Option5 } from "@commander-js/extra-typings";
+import { input as input5, select as select5 } from "@inquirer/prompts";
 import { execSync as execSync2 } from "child_process";
 import { colorize as colorize6 } from "consola/utils";
 import { pathExistsSync } from "fs-extra/esm";
 import kebabCase from "lodash.kebabcase";
 import { join as join11 } from "path";
 
-// src/cli/lib/detect-package-manager.ts
-import { access } from "fs/promises";
-import { join as join7 } from "path";
-import { detectPackageManager as detectFromDir } from "nypm";
-var PROJECT_LOCKFILES = [
-  ["pnpm-lock.yaml", "pnpm"],
-  ["yarn.lock", "yarn"],
-  ["bun.lock", "bun"],
-  ["bun.lockb", "bun"],
-  ["package-lock.json", "npm"]
-];
-var detectLockfileManager = async (dir) => {
-  const found = await Promise.all(
-    PROJECT_LOCKFILES.map(
-      async ([file, manager]) => access(join7(dir, file)).then(() => manager).catch(() => null)
-    )
-  );
-  return found.find((manager) => manager !== null) ?? null;
-};
-var detectPackageManager = () => {
-  const userAgent = process.env.npm_config_user_agent ?? "";
-  const name = userAgent.split(" ")[0]?.split("/")[0];
-  if (name === "pnpm" || name === "yarn" || name === "bun") {
-    return name;
-  }
-  if (process.versions.bun) {
-    return "bun";
-  }
-  return "npm";
-};
-var detectProjectPackageManager = async (projectDir) => {
-  const detected = await detectFromDir(projectDir);
-  const name = detected?.name;
-  if (name === "pnpm" || name === "yarn" || name === "bun" || name === "npm") {
-    return name;
-  }
-  return "npm";
-};
-
 // src/cli/lib/extract-catalyst.ts
 import { mkdirSync as mkdirSync2 } from "fs";
 import { Readable } from "stream";
@@ -2239,43 +2779,6 @@ var initGitRepo = (projectDir) => {
   }
 };
 
-// src/cli/lib/install-dependencies.ts
-import { installDependencies as installDeps } from "nypm";
-import yoctoSpinner2 from "yocto-spinner";
-var restoreEnv = (key, previous) => {
-  if (previous === void 0) {
-    Reflect.deleteProperty(process.env, key);
-  } else {
-    process.env[key] = previous;
-  }
-};
-var withQuietInstallEnv = async (run2) => {
-  var _a, _b;
-  const prevNodeNoWarnings = process.env.NODE_NO_WARNINGS;
-  const prevDownloadPrompt = process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT;
-  (_a = process.env).NODE_NO_WARNINGS ?? (_a.NODE_NO_WARNINGS = "1");
-  (_b = process.env).COREPACK_ENABLE_DOWNLOAD_PROMPT ?? (_b.COREPACK_ENABLE_DOWNLOAD_PROMPT = "0");
-  try {
-    return await run2();
-  } finally {
-    restoreEnv("NODE_NO_WARNINGS", prevNodeNoWarnings);
-    restoreEnv("COREPACK_ENABLE_DOWNLOAD_PROMPT", prevDownloadPrompt);
-  }
-};
-var installDependencies = async (projectDir, packageManager = "pnpm") => {
-  const spinner = yoctoSpinner2().start(
-    `Installing dependencies with ${packageManager}. This could take a minute...`
-  );
-  try {
-    await withQuietInstallEnv(() => installDeps({ cwd: projectDir, silent: true, packageManager }));
-    spinner.success("Dependencies installed successfully.");
-  } catch (error) {
-    const message = error instanceof Error ? error.message : "unknown error";
-    spinner.error(`Failed to install dependencies: ${message}`);
-    throw error;
-  }
-};
-
 // src/cli/lib/rewrite-core-package.ts
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
 import { join as join9 } from "path";
@@ -2437,7 +2940,7 @@ async function setupProject(options) {
       projectDir = targetDir;
       return true;
     };
-    await input4({
+    await input5({
       message: "What do you want to name your project directory?",
       default: "my-catalyst-app",
       validate: validateProjectName
@@ -2476,7 +2979,7 @@ Examples:
   "Arbitrary environment variables to set in .env.local. Format: KEY=VALUE (repeatable).",
   parseEnvFlag
 ).addOption(
-  new Option4(
+  new Option5(
     "--hosting <mode>",
     'Hosting mode: "self-hosted" (default) or "commerce" to set up Commerce Hosting at create time. When omitted, scaffolding is hosting-agnostic; run `catalyst deploy` later to opt in.'
   ).choices(["self-hosted", "commerce"])
@@ -2484,11 +2987,11 @@ Examples:
   "--use-existing",
   "Only used with --hosting commerce and --project-name. When the named project already exists on the store, reuse it instead of prompting. Has no effect without --hosting commerce."
 ).addOption(
-  new Option4("--bigcommerce-hostname <hostname>", "BigCommerce hostname").default("bigcommerce.com").hideHelp()
+  new Option5("--bigcommerce-hostname <hostname>", "BigCommerce hostname").default("bigcommerce.com").hideHelp()
 ).addOption(
-  new Option4("--login-url <url>", "BigCommerce login URL.").env("BIGCOMMERCE_LOGIN_URL").default(DEFAULT_LOGIN_URL).hideHelp()
+  new Option5("--login-url <url>", "BigCommerce login URL.").env("BIGCOMMERCE_LOGIN_URL").default(DEFAULT_LOGIN_URL).hideHelp()
 ).addOption(
-  new Option4("--cli-api-origin <origin>", "Catalyst CLI API origin").default("https://cxm-prd.bigcommerceapp.com").hideHelp()
+  new Option5("--cli-api-origin <origin>", "Catalyst CLI API origin").default("https://cxm-prd.bigcommerceapp.com").hideHelp()
 ).action(async (options) => {
   const { ghRef, repository } = options;
   if (options.useExisting && options.hosting !== "commerce") {
@@ -2582,7 +3085,6 @@ Examples:
   if (useCommerceHosting && accessToken) {
     envVars.BIGCOMMERCE_ACCESS_TOKEN = accessToken;
   }
-  if (accessToken) envVars.CATALYST_ACCESS_TOKEN = accessToken;
   let commerceHostingProject;
   if (useCommerceHosting && storeHash && accessToken) {
     const apiHost = `api.${options.bigcommerceHostname}`;
@@ -2645,7 +3147,7 @@ ${steps.map((step) => `  ${colorize6("yellow", step)}`).join("\n")}`
 });
 
 // src/cli/commands/debug.ts
-import { Command as Command5, Option as Option5 } from "commander";
+import { Command as Command5, Option as Option6 } from "commander";
 
 // src/cli/lib/collect-diagnostics.ts
 import { parse } from "dotenv";
@@ -2896,7 +3398,7 @@ Examples:
 
   # Print machine-readable JSON (useful for copy/paste or piping)
   $ catalyst debug --json`
-).addOption(new Option5("--json", "Output the report as JSON.")).action((options) => {
+).addOption(new Option6("--json", "Output the report as JSON.")).action((options) => {
   const diagnostics = collectDiagnostics();
   if (options.json) {
     consola.log(JSON.stringify(diagnostics, null, 2));
@@ -2906,9 +3408,9 @@ Examples:
 });
 
 // src/cli/commands/deploy.ts
-import { confirm as confirm3 } from "@inquirer/prompts";
+import { confirm as confirm4 } from "@inquirer/prompts";
 import AdmZip from "adm-zip";
-import { Command as Command6, Option as Option6 } from "commander";
+import { Command as Command6, Option as Option7 } from "commander";
 import { colorize as colorize7 } from "consola/utils";
 import { access as access2, readdir, readFile } from "fs/promises";
 import { join as join13 } from "path";
@@ -3174,8 +3676,11 @@ Example:
 ).addOption(storeHashOption()).addOption(accessTokenOption()).addOption(apiHostOption()).addOption(projectUuidOption()).option(
   "--update-site-url",
   "After a successful deploy, prompt to update a channel's site URL to the new hostname."
+).option(
+  "--update-checkout-url",
+  "After a successful deploy, prompt to update a channel's checkout URL."
 ).addOption(
-  new Option6(
+  new Option7(
     "--secret <value>",
     "Secret to set for this deployment (repeatable). Overrides a stored value for the same key. Format: --secret KEY=VALUE"
   ).argParser((value, previous = []) => {
@@ -3185,7 +3690,7 @@ Example:
   "--prebuilt",
   "Skip the build step. Requires .bigcommerce/dist/ to already contain build output."
 ).addOption(
-  new Option6(
+  new Option7(
     "--wrangler-version <version>",
     `Wrangler version or dist-tag to build with. Ignored with --prebuilt. Defaults to ${WRANGLER_VERSION}.`
   ).argParser(parseWranglerVersion)
@@ -3235,7 +3740,7 @@ Example:
     consola.success(`Linked project "${selected.name}".`);
   }
   if (!getProjectState().isTransformed) {
-    const shouldSetup = await confirm3({
+    const shouldSetup = await confirm4({
       message: "Your project is not yet set up for Commerce Hosting deployments. Would you like to run the Commerce Hosting setup now?",
       default: true
     });
@@ -3250,6 +3755,12 @@ Example:
     await installDependencies(projectDir, packageManager);
   } else {
     await cleanupCloudflareIncompatibilities(process.cwd());
+    if (options.prebuilt) {
+      const projectDir = process.cwd();
+      await reconcileOpenNextVersion(projectDir, await detectProjectPackageManager(projectDir), {
+        canUpgrade: false
+      });
+    }
   }
   if (options.prebuilt) {
     const distDir = join13(process.cwd(), ".bigcommerce", "dist");
@@ -3300,30 +3811,45 @@ Example:
     accessToken,
     apiHost
   );
-  if (!options.updateSiteUrl) {
-    return;
-  }
-  try {
-    await runChannelSiteUrlFlow({
-      storeHash,
-      accessToken,
-      apiHost,
-      projectUuid,
-      preferHostname: deploymentHostname
-    });
-  } catch (error) {
+  const warnChannelFlowFailed = (what, error) => {
     consola.warn(
-      `Failed to update channel site URL: ${error instanceof Error ? error.message : String(error)}`
+      `Failed to update channel ${what}: ${error instanceof Error ? error.message : String(error)}`
     );
     consola.info(
       "Update it manually in the control panel, or re-run `catalyst auth login` if the token is missing the store_channel_settings scope."
     );
+  };
+  let resolvedChannelId;
+  if (options.updateSiteUrl) {
+    try {
+      ({ channelId: resolvedChannelId } = await runChannelSiteUrlFlow({
+        storeHash,
+        accessToken,
+        apiHost,
+        projectUuid,
+        preferHostname: deploymentHostname
+      }));
+    } catch (error) {
+      warnChannelFlowFailed("site URL", error);
+    }
+  }
+  if (options.updateCheckoutUrl) {
+    try {
+      await runChannelCheckoutUrlFlow({
+        storeHash,
+        accessToken,
+        apiHost,
+        channelId: resolvedChannelId
+      });
+    } catch (error) {
+      warnChannelFlowFailed("checkout URL", error);
+    }
   }
 });
 
 // src/cli/commands/domains.ts
-import { confirm as confirm4, select as select6 } from "@inquirer/prompts";
-import { Command as Command7, Option as Option7 } from "commander";
+import { confirm as confirm5, select as select6 } from "@inquirer/prompts";
+import { Command as Command7, Option as Option8 } from "commander";
 import { colorize as colorize9 } from "consola/utils";
 
 // src/cli/lib/domains.ts
@@ -3652,7 +4178,7 @@ async function createDomain(domain, projectUuid, storeHash, accessToken, apiHost
   const result = await response.json();
   return createdDomainResponseSchema.parse(result).data;
 }
-async function getDomain(domain, projectUuid, storeHash, accessToken, apiHost) {
+async function getDomain2(domain, projectUuid, storeHash, accessToken, apiHost) {
   const response = await fetch(domainUrl(storeHash, projectUuid, domain, apiHost), {
     method: "GET",
     headers: authHeaders3(accessToken)
@@ -3789,7 +4315,7 @@ function formatPointingRecords(records) {
   if (rows.length === 0) {
     return null;
   }
-  return rows.map((row) => `  ${row}`).join("\n");
+  return rows.map((row2) => `  ${row2}`).join("\n");
 }
 function formatOwnershipVerification(record) {
   const lines = [
@@ -3812,10 +4338,10 @@ async function waitForDomainVerification({
   timeoutMs = WAIT_TIMEOUT_MS
 }) {
   const startedAt = Date.now();
-  let current = await getDomain(domain, projectUuid, storeHash, accessToken, apiHost);
+  let current = await getDomain2(domain, projectUuid, storeHash, accessToken, apiHost);
   while (current.verification_status === "pending" && Date.now() - startedAt < timeoutMs) {
     await sleep(intervalMs);
-    current = await getDomain(domain, projectUuid, storeHash, accessToken, apiHost);
+    current = await getDomain2(domain, projectUuid, storeHash, accessToken, apiHost);
   }
   return current;
 }
@@ -3895,7 +4421,7 @@ Examples:
   # Show pending domains only
   $ catalyst domains list --status pending`
 ).addOption(storeHashOption()).addOption(accessTokenOption()).addOption(apiHostOption()).addOption(projectUuidOption()).option("--domain <domain>", "Only show a specific domain.").addOption(
-  new Option7("--status <status>", "Filter by verification status.").choices(
+  new Option8("--status <status>", "Filter by verification status.").choices(
     DOMAIN_STATUS_FILTERS
   )
 ).action(async (options) => {
@@ -3933,7 +4459,7 @@ Examples:
   const context = resolveDomainCommandContext(options);
   await getTelemetry().identify(context.storeHash);
   consola.start(`Fetching status for ${domain}...`);
-  let result = await getDomain(
+  let result = await getDomain2(
     domain,
     context.projectUuid,
     context.storeHash,
@@ -3984,7 +4510,7 @@ Examples:
     throw error;
   }
   consola.success(`Domain ${domain} claimed.`);
-  let result = await getDomain(
+  let result = await getDomain2(
     domain,
     context.projectUuid,
     context.storeHash,
@@ -4064,7 +4590,7 @@ Examples:
     context.apiHost
   );
   consola.success(`Domain ${domain} transferred.`);
-  let result = await getDomain(
+  let result = await getDomain2(
     domain,
     newProjectUuid,
     context.storeHash,
@@ -4096,7 +4622,7 @@ Examples:
   const context = resolveDomainCommandContext(options);
   await getTelemetry().identify(context.storeHash);
   consola.start(`Fetching status for ${domain}...`);
-  const current = await getDomain(
+  const current = await getDomain2(
     domain,
     context.projectUuid,
     context.storeHash,
@@ -4104,7 +4630,7 @@ Examples:
     context.apiHost
   );
   if (current.verification_status === "verified" && !options.force) {
-    const confirmed = await confirm4({
+    const confirmed = await confirm5({
       message: `Remove active domain ${current.domain}? Traffic may stop routing to this project.`,
       default: false
     });
@@ -4200,7 +4726,7 @@ var env = new Command8("env").configureHelp({ showGlobalOptions: true }).descrip
 ).addCommand(add2).addCommand(remove2).addCommand(list2);
 
 // src/cli/commands/logs.ts
-import { Command as Command9, InvalidArgumentError as InvalidArgumentError4, Option as Option8 } from "commander";
+import { Command as Command9, InvalidArgumentError as InvalidArgumentError4, Option as Option9 } from "commander";
 import { colorize as colorize10 } from "consola/utils";
 import { z as z16 } from "zod";
 var DEFAULT_CONNECTION_TTL_MS = 1 * 60 * 1e3;
@@ -4417,7 +4943,7 @@ Examples:
   # Tail logs as raw JSON (useful for piping to other tools)
   $ catalyst logs tail --format json`
 ).addOption(storeHashOption()).addOption(accessTokenOption()).addOption(apiHostOption()).addOption(projectUuidOption()).addOption(
-  new Option8("--format <format>", "Output format for log events.").choices(["json", "pretty", "default", "short", "request"]).default("default")
+  new Option9("--format <format>", "Output format for log events.").choices(["json", "pretty", "default", "short", "request"]).default("default")
 ).action(async (options) => {
   try {
     const config2 = getProjectConfig();
@@ -4518,7 +5044,7 @@ Examples:
   # Raw JSON (NDJSON) for piping to other tools
   $ catalyst logs query --since 2d --format json`
 ).addOption(storeHashOption()).addOption(accessTokenOption()).addOption(apiHostOption()).addOption(projectUuidOption()).addOption(
-  new Option8(
+  new Option9(
     "--since <duration>",
     "Relative window ending at --end (default: now), e.g. 30m, 6h, 2d (units: s, m, h, d)."
   ).conflicts("start")
@@ -4526,28 +5052,28 @@ Examples:
   "--end <time>",
   "Window end: ISO-8601 timestamp or Unix epoch (seconds). Defaults to now. The window must not exceed 7 days."
 ).option("--method <method>", "Filter by request HTTP method (case-insensitive).").addOption(
-  new Option8("--status-code <code>", "Filter by response status code (100-599).").argParser(
+  new Option9("--status-code <code>", "Filter by response status code (100-599).").argParser(
     parseIntInRange("--status-code", 100, 599)
   )
 ).option("--url-like <substring>", "Filter by URL substring (case-sensitive).").addOption(
-  new Option8("--level-min <level>", "Minimum log level.").choices(Array.from(LOG_LEVELS))
+  new Option9("--level-min <level>", "Minimum log level.").choices(Array.from(LOG_LEVELS))
 ).addOption(
-  new Option8(
+  new Option9(
     "--limit <count>",
     "Maximum entries per page (1-500). Defaults to the API default (100)."
   ).argParser(parseIntInRange("--limit", 1, 500))
 ).addOption(
-  new Option8(
+  new Option9(
     "--after <cursor>",
     "Return the page after (older than) this cursor, from a previous page's end_cursor."
   ).conflicts("before")
 ).addOption(
-  new Option8(
+  new Option9(
     "--before <cursor>",
     "Return the page before (newer than) this cursor, from a previous page's start_cursor."
   )
 ).addOption(
-  new Option8("--format <format>", "Output format for log entries.").choices(["json", "pretty", "default", "short", "request"]).default("default")
+  new Option9("--format <format>", "Output format for log entries.").choices(["json", "pretty", "default", "short", "request"]).default("default")
 ).action(async (options) => {
   try {
     const config2 = getProjectConfig();
@@ -4608,7 +5134,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 confirm5, input as input5, select as select7 } from "@inquirer/prompts";
+import { confirm as confirm6, 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) {
@@ -4617,7 +5143,7 @@ async function offerCommerceHostingSetup(projectUuid, credentials) {
     await cleanupCloudflareIncompatibilities(projectDir);
     return;
   }
-  const shouldSetup = await confirm5({
+  const shouldSetup = await confirm6({
     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
   });
@@ -4696,7 +5222,7 @@ Example:
     }
   }
   await getTelemetry().identify(storeHash);
-  const newProjectName = await input5({ message: "Enter a name for the new project:" });
+  const newProjectName = await input6({ message: "Enter a name for the new project:" });
   const data = await createProject(newProjectName, storeHash, accessToken, apiHost);
   consola.success(`Project "${data.name}" created successfully.`);
   consola.start("Writing project UUID to .bigcommerce/project.json...");
@@ -4813,7 +5339,7 @@ Examples:
   }
   if (!options.force) {
     const label = targetName ? `"${targetName}" (${targetUuid})` : targetUuid;
-    const confirmed = await confirm5({
+    const confirmed = await confirm6({
       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
     });
@@ -4890,7 +5416,7 @@ Example:
 });
 
 // src/cli/commands/telemetry.ts
-import { Argument, Command as Command12, Option as Option9 } from "commander";
+import { Argument, Command as Command12, Option as Option10 } from "commander";
 import { colorize as colorize12 } from "consola/utils";
 var telemetryService = getTelemetry();
 var isEnabled = telemetryService.isEnabled();
@@ -4908,7 +5434,7 @@ Examples:
 
   # Disable telemetry collection
   $ catalyst telemetry --disable`
-).addArgument(new Argument("[arg]").choices(["disable", "enable", "status"])).addOption(new Option9("--enable", `Enables CLI telemetry collection.`).conflicts("disable")).option("--disable", `Disables CLI telemetry collection.`).action((arg, options) => {
+).addArgument(new Argument("[arg]").choices(["disable", "enable", "status"])).addOption(new Option10("--enable", `Enables CLI telemetry collection.`).conflicts("disable")).option("--disable", `Disables CLI telemetry collection.`).action((arg, options) => {
   if (options.enable || arg === "enable") {
     telemetryService.setEnabled(true);
     isEnabled = true;
@@ -4935,8 +5461,8 @@ Examples:
 });
 
 // src/cli/commands/upgrade.ts
-import { Command as Command13, Option as Option10 } from "@commander-js/extra-typings";
-import { confirm as confirm6 } from "@inquirer/prompts";
+import { Command as Command13, Option as Option11 } from "@commander-js/extra-typings";
+import { confirm as confirm7 } from "@inquirer/prompts";
 import { execa as execa4 } from "execa";
 import {
   access as access3,
@@ -4952,7 +5478,7 @@ import {
 } from "fs/promises";
 import { homedir, tmpdir } from "os";
 import { dirname as dirname5, join as join15, relative as relative2 } from "path";
-import { minVersion, satisfies, lt as semverLt, validRange, valid as validSemver2 } from "semver";
+import { minVersion as minVersion2, satisfies as satisfies2, lt as semverLt2, validRange as validRange2, valid as validSemver2 } from "semver";
 import yoctoSpinner4 from "yocto-spinner";
 import { z as z17 } from "zod";
 var CorePackageJson = z17.object({
@@ -5087,15 +5613,81 @@ async function normalizeWorkspaceDeps(ourPkgRaw, baseDir, theirsDir, baseVersion
 var migrateWorkspaceDeps = (raw, findings) => findings.reduce((acc, { name, version: version2 }) => rewriteWorkspaceSpecifier(acc, name, version2), raw);
 async function findStaleCli(pkgRaw) {
   const range = readDepSpecifiers(pkgRaw)[CATALYST_CLI_PACKAGE];
-  if (range === void 0 || !validRange(range)) return null;
+  if (range === void 0 || !validRange2(range)) return null;
   const body = await fetch(`https://registry.npmjs.org/${CATALYST_CLI_PACKAGE}/latest`, {
     // A hanging registry would otherwise stall the CLI indefinitely.
     signal: AbortSignal.timeout(5e3)
   }).then((res) => res.ok ? res.json() : null).catch(() => null);
   const latest = z17.object({ version: z17.string() }).safeParse(body).data?.version;
-  if (latest === void 0 || !validSemver2(latest) || satisfies(latest, range)) return null;
-  const current = minVersion(range)?.version;
-  return current !== void 0 && semverLt(current, latest) ? { current, latest } : null;
+  if (latest === void 0 || !validSemver2(latest) || satisfies2(latest, range)) return null;
+  const current = minVersion2(range)?.version;
+  return current !== void 0 && semverLt2(current, latest) ? { current, latest } : null;
+}
+var CLI_MANAGED_SCRIPTS = ["build", "start", "deploy"];
+var ScriptsPackageJson = z17.looseObject({
+  scripts: z17.record(z17.string(), z17.string()).optional()
+});
+var readScripts = (raw) => {
+  try {
+    return ScriptsPackageJson.parse(JSON.parse(raw)).scripts ?? {};
+  } catch {
+    return {};
+  }
+};
+var SCRIPTS_BLOCK = /"scripts"\s*:\s*\{(?:[^{}"]|"(?:[^"\\]|\\.)*")*\}/;
+var rewriteScriptCommand = (raw, name, command) => {
+  const block = SCRIPTS_BLOCK.exec(raw);
+  if (!block) return raw;
+  const splice = (replacement) => raw.slice(0, block.index) + replacement + raw.slice(block.index + block[0].length);
+  const updated = block[0].replace(
+    new RegExp(`("${escapeRegExp(name)}"\\s*:\\s*)"(?:[^"\\\\]|\\\\.)*"`),
+    (_match, key) => `${key}${JSON.stringify(command)}`
+  );
+  if (updated !== block[0]) return splice(updated);
+  const closeIdx = block[0].length - 1;
+  const head = block[0].slice(0, closeIdx).replace(/\s+$/, "");
+  const closeIndent = /\n([ \t]*)$/.exec(block[0].slice(0, closeIdx))?.[1] ?? "";
+  const entryIndent = /\n([ \t]*)"/.exec(block[0])?.[1] ?? `${closeIndent}  `;
+  const separator = head.endsWith("{") ? "" : ",";
+  return splice(
+    `${head}${separator}
+${entryIndent}${JSON.stringify(name)}: ${JSON.stringify(command)}
+${closeIndent}}`
+  );
+};
+async function normalizeManagedScripts(ourPkgRaw, baseDir, theirsDir) {
+  const basePath = join15(baseDir, "package.json");
+  const theirsPath = join15(theirsDir, "package.json");
+  const [originalBase, originalTheirs] = await Promise.all([
+    readFile2(basePath, "utf-8").catch(() => null),
+    readFile2(theirsPath, "utf-8").catch(() => null)
+  ]);
+  if (originalBase === null || originalTheirs === null) return { pinned: [], upstreamChanged: [] };
+  const ourScripts = readScripts(ourPkgRaw);
+  const baseScripts = readScripts(originalBase);
+  const theirsScripts = readScripts(originalTheirs);
+  const decisions = CLI_MANAGED_SCRIPTS.flatMap((name) => {
+    const ours = ourScripts[name];
+    return ours !== void 0 && ours !== baseScripts[name] ? [{ name, ours }] : [];
+  });
+  const upstreamChanged = decisions.flatMap(({ name }) => {
+    const base = baseScripts[name] ?? null;
+    const theirs = theirsScripts[name] ?? null;
+    return base !== theirs ? [{ name, base, theirs }] : [];
+  });
+  const baseRaw = decisions.reduce(
+    (acc, { name, ours }) => rewriteScriptCommand(acc, name, ours),
+    originalBase
+  );
+  const theirsRaw = decisions.reduce(
+    (acc, { name, ours }) => rewriteScriptCommand(acc, name, ours),
+    originalTheirs
+  );
+  await Promise.all([
+    baseRaw === originalBase ? null : writeFile2(basePath, baseRaw),
+    theirsRaw === originalTheirs ? null : writeFile2(theirsPath, theirsRaw)
+  ]);
+  return { pinned: decisions.map(({ name }) => name), upstreamChanged };
 }
 async function mergeFile(oursPath, basePath, theirsPath) {
   const merged = await execa4(
@@ -5450,7 +6042,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 confirm6({ message: `Upgrade from ${guess}?`, default: true }).catch(() => false);
+  const ok = await confirm7({ 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;
@@ -5468,6 +6060,20 @@ ${rows}
 They resolve to your local packages/ copies, which \`catalyst upgrade\` does not update \u2014 so they never receive upgrades.`
   );
 }
+function printManagedScriptFindings(findings) {
+  if (findings.length === 0) return;
+  const pad = Math.max(...findings.map((finding) => finding.name.length));
+  const show = (command) => command ?? "(absent)";
+  const rows = findings.map(
+    (finding) => `  ${finding.name.padEnd(pad)}  ${show(finding.base)} \u2192 ${show(finding.theirs)}`
+  ).join("\n");
+  consola.warn(
+    `Core's own version of ${findings.length} npm script${findings.length === 1 ? "" : "s"} the CLI manages for you changed:
+${rows}
+
+Your project keeps its \`catalyst\`-backed command, which is almost always what you want \u2014 \`catalyst build\`/\`start\`/\`deploy\` wrap the equivalent \`next\` command. Apply the change by hand only if you have opted out of the CLI scripts.`
+  );
+}
 function printSummary({
   result,
   relDir,
@@ -5511,23 +6117,42 @@ Resolve them, then: git add ${relDir} && git commit${install}`
     );
   }
 }
+async function reconcileNativeHosting(catalystRoot, result) {
+  const state = getProjectState(catalystRoot);
+  if (!state.isLinked && !state.isTransformed) return;
+  const instrumentationRel = "instrumentation.ts";
+  const instrumentationPath = join15(catalystRoot, instrumentationRel);
+  const hadInstrumentation = await pathExists(instrumentationPath);
+  try {
+    await cleanupCloudflareIncompatibilities(catalystRoot);
+  } catch (err) {
+    consola.warn(
+      `Couldn't fully reconcile native-hosting files (${err instanceof Error ? err.message : String(err)}). Remove @vercel/otel from package.json by hand if the merge brought it back.`
+    );
+  }
+  if (hadInstrumentation && !await pathExists(instrumentationPath)) {
+    result.conflicted = result.conflicted.filter((rel) => rel !== instrumentationRel);
+    result.applied = result.applied.filter((rel) => rel !== instrumentationRel);
+    result.added = result.added.filter((rel) => rel !== instrumentationRel);
+  }
+}
 var upgrade = new Command13("upgrade").configureHelp({ showGlobalOptions: true }).aliases([
   "up",
   // These are hidden aliases
   "upgrayedd",
   "ugrad"
 ]).description("Upgrade your Catalyst project to a newer version by applying a 3-way merge.").argument("[version]", "Target version to upgrade to (default: latest)").addOption(
-  new Option10(
+  new Option11(
     "--ref <ref>",
     "Full git tag to upgrade to, e.g. an integration family like @bigcommerce/catalyst-makeswift@1.7.0. Overrides [version]."
   )
-).addOption(new Option10("--from <ref>", "Base ref to upgrade from (when catalyst.ref is missing)")).option("--dry-run", "Generate and display the diff without applying it").option("--yes", "Skip confirmation prompts (e.g. inferred base ref)").addOption(
-  new Option10(
+).addOption(new Option11("--from <ref>", "Base ref to upgrade from (when catalyst.ref is missing)")).option("--dry-run", "Generate and display the diff without applying it").option("--yes", "Skip confirmation prompts (e.g. inferred base ref)").addOption(
+  new Option11(
     "--strategy <strategy>",
     "Merge engine: tree (git merge-tree, full fidelity), per-file (git merge-file, no-history fallback), or auto (tree when git >= 2.38, else per-file)"
   ).choices(["auto", "tree", "per-file"]).default("auto").hideHelp()
 ).addOption(
-  new Option10("--repository <owner/repo>", "GitHub repository to pull versions from").default(
+  new Option11("--repository <owner/repo>", "GitHub repository to pull versions from").default(
     DEFAULT_REPOSITORY
   )
 ).addHelpText(
@@ -5642,6 +6267,11 @@ to raise the GitHub API rate limit.`
       baseVersions,
       targetVersions
     );
+    const { upstreamChanged: managedScripts } = await normalizeManagedScripts(
+      project.rawContent,
+      baseDir,
+      theirsDir
+    );
     if (options.dryRun) {
       const diffSpinner = yoctoSpinner4().start("Generating diff...");
       const diff = await execa4(
@@ -5662,6 +6292,7 @@ to raise the GitHub API rate limit.`
       consola.log("\nDiff preview (--dry-run, not applied):\n");
       consola.log(diff.stdout);
       printWorkspaceFindings(workspaceDeps);
+      printManagedScriptFindings(managedScripts);
       return;
     }
     const strategy = await resolveStrategy(options.strategy);
@@ -5709,10 +6340,11 @@ to raise the GitHub API rate limit.`
         );
       }
     }
+    printManagedScriptFindings(managedScripts);
     printWorkspaceFindings(workspaceDeps);
     let migratedDeps = 0;
     if (workspaceDeps.length) {
-      const accepted = stampedText !== null && (options.yes === true || Boolean(process.stdin.isTTY) && await confirm6({
+      const accepted = stampedText !== null && (options.yes === true || Boolean(process.stdin.isTTY) && await confirm7({
         message: "Replace them with the published versions?",
         default: true
       }).catch(() => false));
@@ -5728,6 +6360,7 @@ to raise the GitHub API rate limit.`
         );
       }
     }
+    await reconcileNativeHosting(catalystRoot, result);
     try {
       await applyIndexState(gitRoot, relDir, baseDir, theirsDir, result, stampedText !== null);
     } catch (err) {