@bigcommerce/catalyst 1.0.0-alpha.5 → 1.0.0-alpha.6

package/dist/cli.js

@@ -28,7 +28,7 @@ import { randomBytes, randomUUID } from "crypto";
 // package.json
 var package_default = {
   name: "@bigcommerce/catalyst",
-  version: "1.0.0-alpha.5",
+  version: "1.0.0-alpha.6",
   type: "module",
   bin: {
     catalyst: "dist/cli.js"
@@ -197,7 +197,7 @@ function getTelemetry() {
 // src/cli/program.ts
 import { Option as Option9 } from "@commander-js/extra-typings";
 import { Command as Command12 } from "commander";
-import { colorize as colorize8 } from "consola/utils";
+import { colorize as colorize9 } from "consola/utils";
 import { config } from "dotenv";
 import { existsSync as existsSync5 } from "fs";
 import { resolve } from "path";
@@ -207,7 +207,7 @@ import { Command, Option as Option2 } from "commander";
 import { z as z4 } from "zod";
 
 // src/cli/lib/login.ts
-import { password } from "@inquirer/prompts";
+import { confirm, input, password } from "@inquirer/prompts";
 import { colorize } from "consola/utils";
 import open from "open";
 import yoctoSpinner from "yocto-spinner";
@@ -337,8 +337,8 @@ async function manualLogin(apiHost) {
   Settings \u2192 API \u2192 Store-level API accounts \u2192 Create API account
 Grant these OAuth scopes: ${DEVICE_OAUTH_SCOPES}`
   );
-  const storeHashInput = await consola.prompt("Store hash:", { type: "text" });
-  const storeHash = String(storeHashInput).trim();
+  const storeHashInput = await input({ message: "Store hash:" });
+  const storeHash = storeHashInput.trim();
   if (!storeHash) {
     throw new Error("Store hash is required.");
   }
@@ -366,10 +366,10 @@ async function login(loginUrl, apiHost) {
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     consola.warn(`Browser login didn't work (${message}).`);
-    const shouldFallback = await consola.prompt(
-      "Try logging in manually with a store hash and access token instead?",
-      { type: "confirm", initial: true }
-    );
+    const shouldFallback = await confirm({
+      message: "Try logging in manually with a store hash and access token instead?",
+      default: true
+    });
     if (!shouldFallback) {
       throw new LoginAbortedError();
     }
@@ -783,12 +783,17 @@ function getProjectState(cwd = process.cwd()) {
 }
 
 // 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: "2025-09-15",
+    compatibility_date: getCompatibilityDate(),
     compatibility_flags: ["nodejs_compat", "global_fetch_strictly_public"],
     observability: {
       enabled: true,
@@ -935,7 +940,14 @@ Examples:
 });
 
 // src/cli/commands/channel.ts
-import { Command as Command3, Option as Option4 } from "commander";
+import { select as select3 } from "@inquirer/prompts";
+import { Command as Command3, InvalidArgumentError, Option as Option4 } from "commander";
+import { colorize as colorize3 } from "consola/utils";
+import { outputFileSync } from "fs-extra/esm";
+import { join as join6 } from "path";
+
+// src/cli/lib/channel-site-flow.ts
+import { select as select2 } from "@inquirer/prompts";
 
 // src/cli/lib/channels.ts
 import { z as z6 } from "zod";
@@ -958,6 +970,20 @@ var channelSchema = z6.object({
 var channelsResponseSchema = z6.object({
   data: z6.array(channelSchema)
 });
+var CHANNEL_PLATFORM_ORDER = ["catalyst", "next", "bigcommerce"];
+function sortChannelsByPlatform(channels) {
+  return [...channels].sort((a, b) => {
+    const aIndex = CHANNEL_PLATFORM_ORDER.indexOf(a.platform);
+    const bIndex = CHANNEL_PLATFORM_ORDER.indexOf(b.platform);
+    if (aIndex === -1 && bIndex === -1) return 0;
+    if (aIndex === -1) return 1;
+    if (bIndex === -1) return -1;
+    return aIndex - bIndex;
+  });
+}
+function channelPlatformLabel(platform) {
+  return platform === "bigcommerce" ? "Stencil" : platform.charAt(0).toUpperCase() + platform.slice(1);
+}
 var initResponseSchema = z6.object({
   data: z6.object({
     storefront_api_token: z6.string(),
@@ -1078,7 +1104,7 @@ async function updateChannelSiteUrl(channelId, siteUrl, storeHash, accessToken,
 }
 
 // src/cli/lib/commerce-hosting.ts
-import { input, select, Separator } from "@inquirer/prompts";
+import { confirm as confirm2, input as input2, select, Separator } from "@inquirer/prompts";
 import { colorize as colorize2 } from "consola/utils";
 import {
   existsSync as existsSync2,
@@ -1159,11 +1185,10 @@ var cleanupCloudflareIncompatibilities = async (projectDir) => {
     );
     return;
   }
-  const shouldRemove = await consola.prompt(
-    'Catalyst found core/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 core/package.json?',
-    { type: "confirm", initial: true }
-  );
-  consola.log("");
+  const shouldRemove = await confirm2({
+    message: 'Catalyst found core/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 core/package.json?',
+    default: true
+  });
   if (!shouldRemove) {
     consola.info(
       'Leaving core/instrumentation.ts in place. The Cloudflare worker will continue to log "Failed to prepare server" at cold start until this is resolved manually.'
@@ -1214,15 +1239,8 @@ var NoLinkedProjectError = class extends Error {
   }
 };
 async function promptForNewProjectName(api) {
-  const newProjectName = await consola.prompt("Enter a name for the new project:", {
-    type: "text"
-  });
-  const data = await createProject(
-    String(newProjectName),
-    api.storeHash,
-    api.accessToken,
-    api.apiHost
-  );
+  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: [] };
 }
@@ -1231,31 +1249,31 @@ async function selectOrCreateInfrastructureProject(api, linkedProjectUuid) {
   const existingProjects = await fetchProjects(api.storeHash, api.accessToken, api.apiHost);
   consola.success("Projects fetched.");
   if (existingProjects.length === 0) {
-    const shouldCreate = await consola.prompt(
-      "There are not any hosting projects that you can link to yet. Would you like to create one?",
-      { type: "confirm", initial: true }
-    );
+    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 promptOptions = [
+  const choices = [
     ...existingProjects.map((p) => ({
-      label: p.uuid === linkedProjectUuid ? `${p.name} ${colorize2("green", "[linked]")}` : p.name,
+      name: p.uuid === linkedProjectUuid ? `${p.name} ${colorize2("green", "[linked]")}` : p.name,
       value: p.uuid,
-      hint: p.uuid
+      description: p.uuid
     })),
     {
-      label: "Create a new project",
+      name: "Create a new project",
       value: "create",
-      hint: "Create a new hosting project for this Catalyst storefront."
+      description: "Create a new hosting project for this Catalyst storefront."
     }
   ];
-  const selected = await consola.prompt(
-    "Select a project or create a new project (Press <enter> to select).",
-    { type: "select", options: promptOptions, cancel: "reject" }
-  );
+  const selected = await select({
+    message: "Select a project or create a new project (Press <enter> to select).",
+    choices
+  });
   if (selected === "create") {
     return promptForNewProjectName(api);
   }
@@ -1325,7 +1343,7 @@ async function promptForCommerceHostingProject(api, defaultName, autoUseDefaultN
   return selected;
 }
 async function promptAndCreateCommerceHostingProject(api, takenNames, defaultName) {
-  const projectName = await input({
+  const projectName = await input2({
     message: "What would you like to name your Commerce Hosting project?",
     default: defaultName,
     validate: (value) => {
@@ -1439,16 +1457,14 @@ async function resolveChannel(options) {
       "No Catalyst channels found on this store. Create one with `catalyst create` and try again."
     );
   }
-  const selectedId = await consola.prompt("Select the channel to update.", {
-    type: "select",
-    options: catalystChannels.map((c) => ({
-      label: c.name,
-      value: String(c.id),
-      hint: `id: ${c.id}`
-    })),
-    cancel: "reject"
+  const id = await select2({
+    message: "Select the channel to update.",
+    choices: catalystChannels.map((c) => ({
+      name: c.name,
+      value: c.id,
+      description: `id: ${c.id}`
+    }))
   });
-  const id = Number(selectedId);
   const matched = catalystChannels.find((c) => c.id === id);
   return { id, name: matched?.name };
 }
@@ -1465,12 +1481,11 @@ async function resolveHostname(project2, options) {
     ...project2.deployment_hostnames.filter((h) => h === options.preferHostname),
     ...project2.deployment_hostnames.filter((h) => h !== options.preferHostname)
   ] : project2.deployment_hostnames;
-  const selected = await consola.prompt("Select the hostname to point the channel at.", {
-    type: "select",
-    options: ordered.map((h) => ({ label: h, value: h })),
-    cancel: "reject"
+  const selected = await select2({
+    message: "Select the hostname to point the channel at.",
+    choices: ordered.map((h) => ({ name: h, value: h }))
   });
-  return String(selected);
+  return selected;
 }
 async function runChannelSiteUrlFlow(options) {
   const project2 = await resolveProject(options);
@@ -1488,6 +1503,38 @@ async function runChannelSiteUrlFlow(options) {
   consola.success(`Updated channel ${channelLabel} site URL to ${siteUrl}.`);
 }
 
+// src/cli/lib/env-config.ts
+var ENV_KEY_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+var parseEnvAssignment = (input5) => {
+  const separatorIndex = input5.indexOf("=");
+  if (separatorIndex === -1) {
+    throw new Error(`Invalid env var format: ${input5}. Expected format: KEY=VALUE`);
+  }
+  const key = input5.slice(0, separatorIndex).trim();
+  const value = input5.slice(separatorIndex + 1).trim();
+  if (!key || !value) {
+    throw new Error(`Invalid env var format: ${input5}. Expected format: KEY=VALUE`);
+  }
+  if (!ENV_KEY_PATTERN.test(key)) {
+    throw new Error(
+      `Invalid env var name: ${key}. Names must start with a letter or underscore and contain only letters, numbers, and underscores.`
+    );
+  }
+  return { key, value };
+};
+var getStoredEnv = (config2) => {
+  return config2.get("env") ?? {};
+};
+var toDeploymentSecrets = (envVars) => {
+  return Object.entries(envVars).map(([key, value]) => ({ type: "secret", key, value }));
+};
+var mergeDeploymentSecrets = (persisted, flagSecrets) => {
+  const byKey = /* @__PURE__ */ new Map();
+  persisted.forEach((secret) => byKey.set(secret.key, secret));
+  flagSecrets.forEach((secret) => byKey.set(secret.key, secret));
+  return Array.from(byKey.values());
+};
+
 // src/cli/lib/resolve-credentials.ts
 function resolveCredentials(options, config2) {
   const storeHash = options.storeHash ?? config2.get("storeHash");
@@ -1504,6 +1551,31 @@ function resolveCredentials(options, config2) {
 }
 
 // src/cli/commands/channel.ts
+var parseChannelId = (value) => {
+  const parsed = Number.parseInt(value, 10);
+  if (Number.isNaN(parsed)) {
+    throw new InvalidArgumentError(`"${value}" is not a valid channel ID (expected a number).`);
+  }
+  return parsed;
+};
+async function resolveCredentialsWithLogin(options, config2) {
+  const storeHash = options.storeHash ?? config2.get("storeHash");
+  const accessToken = options.accessToken ?? config2.get("accessToken");
+  if (storeHash && accessToken) {
+    return { storeHash, accessToken };
+  }
+  try {
+    const credentials = await login(options.loginUrl, options.apiHost);
+    config2.set("storeHash", credentials.storeHash);
+    config2.set("accessToken", credentials.accessToken);
+    return credentials;
+  } catch (error) {
+    if (error instanceof LoginAbortedError) {
+      return null;
+    }
+    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(
@@ -1550,33 +1622,111 @@ Examples:
   }
   process.exit(0);
 });
-var channel = new Command3("channel").configureHelp({ showGlobalOptions: true }).description("Manage BigCommerce channels.").addCommand(update);
+var link = new Command3("link").configureHelp({ showGlobalOptions: true }).description(
+  "Link this Catalyst project to a BigCommerce channel and write its credentials to .env.local."
+).addHelpText(
+  "after",
+  `
+Examples:
+  # Pick a channel interactively (logs you in if needed)
+  $ catalyst channel link
+
+  # Non-interactive
+  $ catalyst channel link --store-hash <hash> --access-token <token> --channel-id 123
+
+  # Append extra environment variables to .env.local
+  $ catalyst channel link --channel-id 123 --env MY_FLAG=1`
+).addOption(storeHashOption()).addOption(accessTokenOption()).addOption(apiHostOption()).addOption(loginUrlOption()).addOption(
+  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 Option4("--cli-api-origin <origin>", "Catalyst CLI API origin").default("https://cxm-prd.bigcommerceapp.com").hideHelp()
+).action(async (options) => {
+  const config2 = getProjectConfig();
+  const credentials = await resolveCredentialsWithLogin(options, config2);
+  if (!credentials) {
+    consola.info(
+      "Login aborted. Re-run `catalyst channel link` when you have your credentials ready."
+    );
+    process.exit(0);
+    return;
+  }
+  const { storeHash, accessToken } = credentials;
+  await getTelemetry().identify(storeHash);
+  let channelId = options.channelId;
+  let channelName;
+  if (channelId === void 0) {
+    const channels = await fetchAvailableChannels(storeHash, accessToken, options.apiHost);
+    if (channels.length === 0) {
+      consola.info(
+        "No storefront channels found on this store. Create one with `catalyst create` and try again."
+      );
+      process.exit(0);
+      return;
+    }
+    channelId = await select3({
+      message: "Which channel would you like to link?",
+      choices: sortChannelsByPlatform(channels).map((c) => ({
+        name: c.name,
+        value: c.id,
+        description: channelPlatformLabel(c.platform)
+      }))
+    });
+    channelName = channels.find((c) => c.id === channelId)?.name;
+  }
+  const initData = await getChannelInit(channelId, storeHash, accessToken, options.cliApiOrigin);
+  const envVars = { ...initData.envVars };
+  if (options.env) {
+    options.env.forEach((entry) => {
+      const { key, value } = parseEnvAssignment(entry);
+      envVars[key] = value;
+    });
+  }
+  outputFileSync(
+    join6(process.cwd(), ".env.local"),
+    `${Object.entries(envVars).map(([key, value]) => `${key}=${value}`).join("\n")}
+`
+  );
+  const label = channelName ? `"${channelName}" (${channelId})` : `${channelId}`;
+  consola.success(
+    `Linked to channel ${label} and wrote ${colorize3("cyanBright", ".env.local")}.`
+  );
+  consola.log(`Next steps:
+
+  ${colorize3("yellow", "pnpm run dev")}`);
+  process.exit(0);
+});
+var channel = new Command3("channel").configureHelp({ showGlobalOptions: true }).description("Manage BigCommerce channels.").addCommand(link).addCommand(update);
 
 // src/cli/commands/create.ts
-import { Command as Command4, InvalidArgumentError, Option as Option5 } from "@commander-js/extra-typings";
-import { input as input2, select as select2 } from "@inquirer/prompts";
+import { Command as Command4, InvalidArgumentError as InvalidArgumentError2, Option as Option5 } from "@commander-js/extra-typings";
+import { checkbox, input as input3, select as select4 } from "@inquirer/prompts";
 import { execSync as execSync4 } from "child_process";
-import { colorize as colorize3 } from "consola/utils";
+import { colorize as colorize4 } from "consola/utils";
 import { pathExistsSync } from "fs-extra/esm";
 import kebabCase from "lodash.kebabcase";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 
 // src/cli/lib/build-workspace-packages.ts
 import { execSync } from "child_process";
 import { existsSync as existsSync3 } from "fs";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 import yoctoSpinner2 from "yocto-spinner";
 var WORKSPACE_PACKAGES = ["packages/catalyst", "packages/client"];
 var buildWorkspacePackages = (projectDir) => {
-  const hasCore = existsSync3(join6(projectDir, "core"));
+  const hasCore = existsSync3(join7(projectDir, "core"));
   const hasAllWorkspacePackages = WORKSPACE_PACKAGES.every(
-    (pkg) => existsSync3(join6(projectDir, pkg))
+    (pkg) => existsSync3(join7(projectDir, pkg))
   );
   if (!hasCore || !hasAllWorkspacePackages) return;
   WORKSPACE_PACKAGES.forEach((pkg) => {
     const spinner = yoctoSpinner2().start(`Building ${pkg}...`);
     try {
-      execSync("pnpm build", { cwd: join6(projectDir, pkg), stdio: "ignore" });
+      execSync("pnpm build", { cwd: join7(projectDir, pkg), stdio: "ignore" });
       spinner.success(`Built ${pkg}.`);
     } catch (error) {
       const message = error instanceof Error ? error.message : "unknown error";
@@ -1758,7 +1908,7 @@ var getAvailableLocales = async (storeHash, accessToken, apiHost) => {
 
 // src/cli/lib/setup-core-project.ts
 import { mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
-import { dirname as dirname3, join as join7 } from "path";
+import { dirname as dirname3, join as join8 } from "path";
 import { z as z9 } from "zod";
 var corePackageJsonSchema2 = z9.looseObject({
   scripts: z9.record(z9.string(), z9.string()).optional(),
@@ -1770,7 +1920,7 @@ var writeJson2 = (path, value) => {
 `);
 };
 var setupCoreProject = (projectDir) => {
-  const corePackageJsonPath = join7(projectDir, "core", "package.json");
+  const corePackageJsonPath = join8(projectDir, "core", "package.json");
   const pkg = corePackageJsonSchema2.parse(JSON.parse(readFileSync3(corePackageJsonPath, "utf-8")));
   pkg.scripts = {
     ...pkg.scripts,
@@ -1786,11 +1936,11 @@ var setupCoreProject = (projectDir) => {
 };
 
 // src/cli/lib/write-env.ts
-import { outputFileSync } from "fs-extra/esm";
-import { join as join8 } from "path";
+import { outputFileSync as outputFileSync2 } from "fs-extra/esm";
+import { join as join9 } from "path";
 var writeEnv = (projectDir, envVars) => {
-  outputFileSync(
-    join8(projectDir, "core", ".env.local"),
+  outputFileSync2(
+    join9(projectDir, "core", ".env.local"),
     `${Object.entries(envVars).map(([key, value]) => `${key}=${value}`).join("\n")}
 `
   );
@@ -1801,41 +1951,41 @@ function getPlatformCheckCommand(command) {
   const isWindows = process.platform === "win32";
   return isWindows ? `where.exe ${command}` : `which ${command}`;
 }
-function parseChannelId(value) {
+function parseChannelId2(value) {
   const parsed = parseInt(value, 10);
   if (Number.isNaN(parsed)) {
-    throw new InvalidArgumentError(`"${value}" is not a valid channel ID (expected a number).`);
+    throw new InvalidArgumentError2(`"${value}" is not a valid channel ID (expected a number).`);
   }
   return parsed;
 }
 function parseEnvFlag(value, previous = {}) {
   const eqIdx = value.indexOf("=");
   if (eqIdx <= 0) {
-    throw new InvalidArgumentError(`Expected KEY=VALUE, got "${value}".`);
+    throw new InvalidArgumentError2(`Expected KEY=VALUE, got "${value}".`);
   }
   const key = value.substring(0, eqIdx);
   const val = value.substring(eqIdx + 1);
   if (!val) {
-    throw new InvalidArgumentError(`Expected KEY=VALUE with non-empty value, got "${value}".`);
+    throw new InvalidArgumentError2(`Expected KEY=VALUE with non-empty value, got "${value}".`);
   }
   return { ...previous, [key]: val };
 }
 async function handleChannelCreation(storeHash, accessToken, apiHost, cliApiOrigin) {
-  const newChannelName = await input2({
+  const newChannelName = await input3({
     message: "What would you like to name your new channel?"
   });
   const availableLocales = await getAvailableLocales(storeHash, accessToken, apiHost);
-  const storefrontLocale = await select2({
+  const storefrontLocale = await select4({
     message: "Which default language would you like to set for your channel?",
     default: "en",
     choices: availableLocales,
     theme: {
       style: {
-        help: () => colorize3("dim", "(Select locale from the list or start typing the name)")
+        help: () => colorize4("dim", "(Select locale from the list or start typing the name)")
       }
     }
   });
-  const shouldAddAdditionalLocales = await select2({
+  const shouldAddAdditionalLocales = await select4({
     message: "Would you like to add additional languages?",
     choices: [
       { name: "Yes", value: true },
@@ -1844,21 +1994,14 @@ async function handleChannelCreation(storeHash, accessToken, apiHost, cliApiOrig
   });
   let additionalLocales = [];
   if (shouldAddAdditionalLocales) {
-    const localeOptions = availableLocales.filter(({ value }) => value !== storefrontLocale).map(({ name, value }) => ({ label: name, value, hint: value }));
-    const pickLocales = async () => {
-      const selected = await consola.prompt(
-        "Which additional languages would you like to add to your channel?",
-        { type: "multiselect", options: localeOptions, cancel: "reject" }
-      );
-      if (selected.length > 4) {
-        consola.warn("You can only select up to 4 additional languages. Please try again.");
-        return pickLocales();
-      }
-      return selected;
-    };
-    additionalLocales = await pickLocales();
+    const localeChoices = availableLocales.filter(({ value }) => value !== storefrontLocale).map(({ name, value }) => ({ name, value, description: value }));
+    additionalLocales = await checkbox({
+      message: "Which additional languages would you like to add to your channel?",
+      choices: localeChoices,
+      validate: (items) => items.length <= 4 || "You can only select up to 4 additional languages."
+    });
   }
-  const shouldInstallSampleData = await select2({
+  const shouldInstallSampleData = await select4({
     message: "Would you like to install sample data?",
     choices: [
       { name: "Yes", value: true },
@@ -1876,23 +2019,13 @@ async function handleChannelCreation(storeHash, accessToken, apiHost, cliApiOrig
   );
 }
 async function handleChannelSelection(storeHash, accessToken, apiHost) {
-  const channelSortOrder = ["catalyst", "next", "bigcommerce"];
   const channels = await fetchAvailableChannels(storeHash, accessToken, apiHost);
-  const existingChannel = await select2({
+  const existingChannel = await select4({
     message: "Which channel would you like to use?",
-    choices: channels.sort((a, b) => {
-      const aIndex = channelSortOrder.indexOf(a.platform);
-      const bIndex = channelSortOrder.indexOf(b.platform);
-      if (aIndex === -1 && bIndex === -1) {
-        return 0;
-      }
-      if (aIndex === -1) return 1;
-      if (bIndex === -1) return -1;
-      return aIndex - bIndex;
-    }).map((ch) => ({
+    choices: sortChannelsByPlatform(channels).map((ch) => ({
       name: ch.name,
       value: ch,
-      description: `Channel Platform: ${ch.platform === "bigcommerce" ? "Stencil" : ch.platform.charAt(0).toUpperCase() + ch.platform.slice(1)}`
+      description: `Channel Platform: ${channelPlatformLabel(ch.platform)}`
     }))
   });
   return existingChannel.id;
@@ -1905,7 +2038,7 @@ async function setupProject(options) {
   }
   if (projectName) {
     projectName = kebabCase(projectName);
-    projectDir = join9(options.projectDir, projectName);
+    projectDir = join10(options.projectDir, projectName);
     if (pathExistsSync(projectDir)) {
       consola.error(`${projectDir} already exists`);
       process.exit(1);
@@ -1915,13 +2048,13 @@ async function setupProject(options) {
     const validateProjectName = (i) => {
       const formatted = kebabCase(i);
       if (!formatted) return "Project name is required";
-      const targetDir = join9(options.projectDir, formatted);
+      const targetDir = join10(options.projectDir, formatted);
       if (pathExistsSync(targetDir)) return `Destination '${targetDir}' already exists`;
       projectName = formatted;
       projectDir = targetDir;
       return true;
     };
-    await input2({
+    await input3({
       message: "What do you want to name your project directory?",
       default: "my-catalyst-app",
       validate: validateProjectName
@@ -1959,7 +2092,7 @@ Examples:
 
   # Eagerly set up Commerce Hosting at create time
   $ catalyst create --project-name my-store --hosting commerce`
-).option("--project-name <name>", "Name of your Catalyst project").option("--project-dir <dir>", "Directory in which to create your project", process.cwd()).addOption(storeHashOption()).addOption(accessTokenOption()).option("--channel-id <id>", "BigCommerce channel ID", parseChannelId).option("--storefront-token <token>", "BigCommerce storefront token").option(
+).option("--project-name <name>", "Name of your Catalyst project").option("--project-dir <dir>", "Directory in which to create your project", process.cwd()).addOption(storeHashOption()).addOption(accessTokenOption()).option("--channel-id <id>", "BigCommerce channel ID", parseChannelId2).option("--storefront-token <token>", "BigCommerce storefront token").option(
   "--gh-ref <ref>",
   "Clone a specific ref from the source repository",
   "@bigcommerce/catalyst-core@latest"
@@ -2034,7 +2167,7 @@ Examples:
       }
       let shouldCreateChannel;
       if (eligibility.eligible) {
-        shouldCreateChannel = await select2({
+        shouldCreateChannel = await select4({
           message: "Would you like to create a new channel?",
           choices: [
             { name: "Yes", value: true },
@@ -2116,24 +2249,26 @@ Examples:
     throw error;
   }
   consola.success(`Created '${projectName}' at '${projectDir}'`);
-  consola.info("Next steps:");
-  consola.info(colorize3("yellow", `  cd ${projectName}/core && pnpm run dev`));
+  const steps = [`cd ${projectName}/core && pnpm run dev`];
   if (useCommerceHosting) {
-    consola.info(
-      colorize3(
-        "yellow",
-        `  Run 'cd ${projectName}/core && pnpm run deploy' when ready to deploy to Commerce Hosting.`
-      )
+    steps.push(
+      `Run 'cd ${projectName}/core && pnpm run deploy' when ready to deploy to Commerce Hosting.`
     );
   }
+  consola.log(
+    `Next steps:
+
+${steps.map((step) => `  ${colorize4("yellow", step)}`).join("\n")}`
+  );
 });
 
 // src/cli/commands/deploy.ts
+import { confirm as confirm3 } from "@inquirer/prompts";
 import AdmZip from "adm-zip";
 import { Command as Command5, Option as Option6 } from "commander";
-import { colorize as colorize4 } from "consola/utils";
+import { colorize as colorize5 } from "consola/utils";
 import { access, readdir, readFile } from "fs/promises";
-import { dirname as dirname4, join as join10 } from "path";
+import { dirname as dirname4, join as join11 } from "path";
 import yoctoSpinner4 from "yocto-spinner";
 import { z as z10 } from "zod";
 
@@ -2153,38 +2288,6 @@ function getDeploymentErrorMessage(code) {
   return ERROR_MESSAGES[code] ?? `Deployment failed with an unexpected error (code: ${code}). Please try again. If the issue persists, contact support.`;
 }
 
-// src/cli/lib/env-config.ts
-var ENV_KEY_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
-var parseEnvAssignment = (input3) => {
-  const separatorIndex = input3.indexOf("=");
-  if (separatorIndex === -1) {
-    throw new Error(`Invalid env var format: ${input3}. Expected format: KEY=VALUE`);
-  }
-  const key = input3.slice(0, separatorIndex).trim();
-  const value = input3.slice(separatorIndex + 1).trim();
-  if (!key || !value) {
-    throw new Error(`Invalid env var format: ${input3}. Expected format: KEY=VALUE`);
-  }
-  if (!ENV_KEY_PATTERN.test(key)) {
-    throw new Error(
-      `Invalid env var name: ${key}. Names must start with a letter or underscore and contain only letters, numbers, and underscores.`
-    );
-  }
-  return { key, value };
-};
-var getStoredEnv = (config2) => {
-  return config2.get("env") ?? {};
-};
-var toDeploymentSecrets = (envVars) => {
-  return Object.entries(envVars).map(([key, value]) => ({ type: "secret", key, value }));
-};
-var mergeDeploymentSecrets = (persisted, flagSecrets) => {
-  const byKey = /* @__PURE__ */ new Map();
-  persisted.forEach((secret) => byKey.set(secret.key, secret));
-  flagSecrets.forEach((secret) => byKey.set(secret.key, secret));
-  return Array.from(byKey.values());
-};
-
 // src/cli/commands/deploy.ts
 var stepsEnum = z10.enum([
   "initializing",
@@ -2237,8 +2340,8 @@ var DeploymentStatusSchema = z10.object({
 });
 var generateBundleZip = async () => {
   consola.info("Generating bundle...");
-  const bigcommerceDir = join10(process.cwd(), ".bigcommerce");
-  const distDir = join10(process.cwd(), ".bigcommerce", "dist");
+  const bigcommerceDir = join11(process.cwd(), ".bigcommerce");
+  const distDir = join11(process.cwd(), ".bigcommerce", "dist");
   try {
     await access(distDir);
   } catch {
@@ -2248,7 +2351,7 @@ var generateBundleZip = async () => {
   if (buildDirContents.length === 0) {
     throw new Error(`Dist directory is empty: ${distDir}`);
   }
-  const outputZip = join10(bigcommerceDir, "bundle.zip");
+  const outputZip = join11(bigcommerceDir, "bundle.zip");
   const zip = new AdmZip();
   zip.addLocalFolder(distDir, "output");
   zip.writeZip(outputZip);
@@ -2280,7 +2383,7 @@ var generateUploadSignature = async (storeHash, accessToken, apiHost) => {
 };
 var uploadBundleZip = async (uploadUrl) => {
   consola.info("Uploading bundle...");
-  const zipPath = join10(process.cwd(), ".bigcommerce", "bundle.zip");
+  const zipPath = join11(process.cwd(), ".bigcommerce", "bundle.zip");
   const fileBuffer = await readFile(zipPath);
   const response = await fetch(uploadUrl, {
     method: "PUT",
@@ -2391,7 +2494,7 @@ var getDeploymentStatus = async (deploymentUuid, storeHash, accessToken, apiHost
   spinner.success("Deployment completed successfully.");
   if (deploymentHostname) {
     consola.success(
-      `View your deployment at: ${colorize4("blue", `https://${deploymentHostname}`)}`
+      `View your deployment at: ${colorize5("blue", `https://${deploymentHostname}`)}`
     );
   }
   return deploymentHostname;
@@ -2488,10 +2591,10 @@ Example:
     consola.success(`Linked project "${selected.name}".`);
   }
   if (!getProjectState().isTransformed) {
-    const shouldSetup = await consola.prompt(
-      "Your project is not yet set up for Commerce Hosting deployments. Would you like to run the Commerce Hosting setup now?",
-      { type: "confirm", initial: true }
-    );
+    const shouldSetup = await confirm3({
+      message: "Your project is not yet set up for Commerce Hosting deployments. Would you like to run the Commerce Hosting setup now?",
+      default: true
+    });
     if (!shouldSetup) {
       consola.info("When you're ready to deploy, re-run `catalyst deploy` to complete setup.");
       process.exit(0);
@@ -2504,7 +2607,7 @@ Example:
     await cleanupCloudflareIncompatibilities(dirname4(process.cwd()));
   }
   if (options.prebuilt) {
-    const distDir = join10(process.cwd(), ".bigcommerce", "dist");
+    const distDir = join11(process.cwd(), ".bigcommerce", "dist");
     try {
       await access(distDir);
     } catch {
@@ -2646,7 +2749,7 @@ var env = new Command6("env").configureHelp({ showGlobalOptions: true }).descrip
 
 // src/cli/commands/logs.ts
 import { Command as Command7, Option as Option7 } from "commander";
-import { colorize as colorize5 } from "consola/utils";
+import { colorize as colorize6 } from "consola/utils";
 import { z as z11 } from "zod";
 var telemetry = new Telemetry();
 var DEFAULT_CONNECTION_TTL_MS = 1 * 60 * 1e3;
@@ -2688,7 +2791,7 @@ var formatLogEvent = (event, format) => {
   logEntries.forEach((entry) => {
     const msg = formatMessages(entry.messages);
     const level = entry.level.toUpperCase();
-    const coloredLevel = colorize5(LEVEL_COLORS[level] ?? "white", level);
+    const coloredLevel = colorize6(LEVEL_COLORS[level] ?? "white", level);
     switch (format) {
       case "short":
         consola.log(msg);
@@ -2870,8 +2973,9 @@ Example:
 var logs = new Command7("logs").configureHelp({ showGlobalOptions: true }).description("View logs from your deployed application.").addCommand(tail, { isDefault: true }).addCommand(query);
 
 // src/cli/commands/project.ts
+import { confirm as confirm4, input as input4, select as select5 } from "@inquirer/prompts";
 import { Command as Command8 } from "commander";
-import { colorize as colorize6 } from "consola/utils";
+import { colorize as colorize7 } from "consola/utils";
 import { dirname as dirname5 } from "path";
 async function offerCommerceHostingSetup(projectUuid, credentials) {
   const projectDir = dirname5(process.cwd());
@@ -2879,10 +2983,10 @@ async function offerCommerceHostingSetup(projectUuid, credentials) {
     await cleanupCloudflareIncompatibilities(projectDir);
     return;
   }
-  const shouldSetup = await consola.prompt(
-    "Your project has been linked, but is not fully set up for Commerce Hosting deployments yet. Would you like to run the setup now?",
-    { type: "confirm", initial: true }
-  );
+  const shouldSetup = await confirm4({
+    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
+  });
   if (!shouldSetup) return;
   await setupCommerceHosting({
     projectDir,
@@ -2911,18 +3015,14 @@ Example:
     return;
   }
   const linkedProjectUuid = config2.get("projectUuid");
-  projects.forEach((p) => {
-    const marker = p.uuid === linkedProjectUuid ? ` ${colorize6("green", "[linked]")}` : "";
-    consola.log(`${p.name} (${p.uuid})${marker}`);
-    if (p.deployment_hostnames.length === 0) {
-      consola.log("  (not deployed)");
-    } else {
-      p.deployment_hostnames.forEach((hostname) => {
-        consola.log(`  ${colorize6("blue", `https://${hostname}`)}`);
-      });
-    }
-    consola.log("");
+  const projectList = projects.map((p) => {
+    const marker = p.uuid === linkedProjectUuid ? ` ${colorize7("green", "[linked]")}` : "";
+    const hostnames = p.deployment_hostnames.length === 0 ? ["  (not deployed)"] : p.deployment_hostnames.map(
+      (hostname) => `  ${colorize7("blue", `https://${hostname}`)}`
+    );
+    return [`${p.name} (${p.uuid})${marker}`, ...hostnames].join("\n");
   });
+  consola.log(projectList.join("\n\n"));
   process.exit(0);
 });
 var create2 = new Command8("create").configureHelp({ showGlobalOptions: true }).description(
@@ -2959,9 +3059,7 @@ Example:
     }
   }
   await getTelemetry().identify(storeHash);
-  const newProjectName = await consola.prompt("Enter a name for the new project:", {
-    type: "text"
-  });
+  const newProjectName = await input4({ message: "Enter a name for the new project:" });
   const data = await createProject(newProjectName, storeHash, accessToken, options.apiHost);
   consola.success(`Project "${data.name}" created successfully.`);
   consola.start("Writing project UUID to .bigcommerce/project.json...");
@@ -2971,7 +3069,7 @@ Example:
   consola.success("Project UUID written to .bigcommerce/project.json.");
   process.exit(0);
 });
-var link = new Command8("link").configureHelp({ showGlobalOptions: true }).description(
+var link2 = new Command8("link").configureHelp({ showGlobalOptions: true }).description(
   "Link your local Catalyst project to a BigCommerce infrastructure project. You can provide a project UUID directly, or fetch and select from available projects using your store credentials."
 ).addHelpText(
   "after",
@@ -3051,21 +3149,17 @@ Examples:
       return;
     }
     const linkedProjectUuid = config2.get("projectUuid");
-    const selected = await consola.prompt(
-      "Select a project to delete (Press <enter> to select).",
-      {
-        type: "select",
-        options: [
-          ...projects.map((p) => ({
-            label: p.uuid === linkedProjectUuid ? `${p.name} ${colorize6("green", "[linked]")}` : p.name,
-            value: p.uuid,
-            hint: p.uuid
-          })),
-          { label: "Cancel", value: "cancel", hint: "Exit without deleting any project." }
-        ],
-        cancel: "reject"
-      }
-    );
+    const selected = await select5({
+      message: "Select a project to delete (Press <enter> to select).",
+      choices: [
+        ...projects.map((p) => ({
+          name: p.uuid === linkedProjectUuid ? `${p.name} ${colorize7("green", "[linked]")}` : p.name,
+          value: p.uuid,
+          description: p.uuid
+        })),
+        { name: "Cancel", value: "cancel", description: "Exit without deleting any project." }
+      ]
+    });
     if (selected === "cancel") {
       consola.info("Aborted. No project was deleted.");
       process.exit(0);
@@ -3080,10 +3174,10 @@ Examples:
   }
   if (!options.force) {
     const label = targetName ? `"${targetName}" (${targetUuid})` : targetUuid;
-    const confirmed = await consola.prompt(
-      `Are you sure you want to delete project ${label}? This action is irreversible and will permanently destroy the project and all of its data.`,
-      { type: "confirm", initial: false }
-    );
+    const confirmed = await confirm4({
+      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
+    });
     if (!confirmed) {
       consola.info("Aborted. No project was deleted.");
       process.exit(0);
@@ -3099,13 +3193,13 @@ Examples:
   }
   process.exit(0);
 });
-var project = new Command8("project").configureHelp({ showGlobalOptions: true }).description("Manage your BigCommerce infrastructure project.").addCommand(create2).addCommand(list2).addCommand(link).addCommand(del);
+var project = new Command8("project").configureHelp({ showGlobalOptions: true }).description("Manage your BigCommerce infrastructure project.").addCommand(create2).addCommand(list2).addCommand(link2).addCommand(del);
 
 // src/cli/commands/start.ts
 import { Command as Command9 } from "commander";
 import { execa as execa2 } from "execa";
 import { existsSync as existsSync4, lstatSync as lstatSync2, symlinkSync as symlinkSync2 } from "fs";
-import { join as join11, relative } from "path";
+import { join as join12, relative } from "path";
 var start = new Command9("start").configureHelp({ showGlobalOptions: true }).description(
   "Start a local preview of your Catalyst storefront using the OpenNext Cloudflare adapter."
 ).addHelpText(
@@ -3123,11 +3217,11 @@ Example:
     });
     return;
   }
-  const envLocal = join11(process.cwd(), ".env.local");
-  const devVars = join11(process.cwd(), ".bigcommerce", ".dev.vars");
+  const envLocal = join12(process.cwd(), ".env.local");
+  const devVars = join12(process.cwd(), ".bigcommerce", ".dev.vars");
   if (existsSync4(envLocal)) {
     if (!existsSync4(devVars)) {
-      const target = relative(join11(process.cwd(), ".bigcommerce"), envLocal);
+      const target = relative(join12(process.cwd(), ".bigcommerce"), envLocal);
       symlinkSync2(target, devVars);
       consola.success("Symlinked .bigcommerce/.dev.vars \u2192 .env.local");
     } else if (!lstatSync2(devVars).isSymbolicLink()) {
@@ -3147,7 +3241,7 @@ Example:
       "opennextjs-cloudflare",
       "preview",
       "--config",
-      join11(".bigcommerce", "wrangler.jsonc")
+      join12(".bigcommerce", "wrangler.jsonc")
     ],
     {
       stdio: "inherit",
@@ -3158,7 +3252,7 @@ Example:
 
 // src/cli/commands/telemetry.ts
 import { Argument, Command as Command10, Option as Option8 } from "commander";
-import { colorize as colorize7 } from "consola/utils";
+import { colorize as colorize8 } from "consola/utils";
 var telemetryService = getTelemetry();
 var isEnabled = telemetryService.isEnabled();
 var telemetry2 = new Command10("telemetry").configureHelp({ showGlobalOptions: true }).description(
@@ -3192,7 +3286,7 @@ Examples:
     consola.info("Catalyst CLI Telemetry\n");
   }
   consola.info(
-    `Status: ${colorize7("bold", isEnabled ? colorize7("green", "Enabled") : colorize7("red", "Disabled"))}`
+    `Status: ${colorize8("bold", isEnabled ? colorize8("green", "Enabled") : colorize8("red", "Disabled"))}`
   );
   if (!isEnabled) {
     consola.info(
@@ -3272,7 +3366,7 @@ if (!process.env.CATALYST_STORE_HASH && process.env.BIGCOMMERCE_STORE_HASH) {
   process.env.CATALYST_STORE_HASH = process.env.BIGCOMMERCE_STORE_HASH;
 }
 var program = new Command12();
-consola.log(colorize8("cyanBright", `\u25E2 ${package_default.name} v${package_default.version}
+consola.log(colorize9("cyanBright", `\u25E2 ${package_default.name} v${package_default.version}
 `));
 program.name(package_default.name).version(package_default.version).summary("CLI tool for Catalyst development").description(
   "CLI tool for Catalyst development.\n\nConfiguration priority: flags > env file (--env-path) > process.env > .env.local (auto-loaded from cwd) > .bigcommerce/project.json.\n\nCATALYST_STORE_HASH falls back to BIGCOMMERCE_STORE_HASH if unset.\n\nRun `catalyst <command> --help` for details on a specific command."
@@ -3293,7 +3387,7 @@ program.name(package_default.name).version(package_default.version).summary("CLI
         const message = errCode === "ENOENT" ? `Env file not found: ${envFilePath}` : `Failed to load --env-path ${value}: ${result.error.message}`;
         throw new Error(message);
       }
-      consola.log(colorize8("cyanBright", `Loaded environment variables from ${envFilePath}
+      consola.log(colorize9("cyanBright", `Loaded environment variables from ${envFilePath}
 `));
     }
     return value;