@bigcommerce/catalyst 1.0.0-alpha.1 → 1.0.0-alpha.2

package/dist/cli.js

@@ -1,15 +1,19 @@
 #!/usr/bin/env node
 
-// src/cli/program.ts
-import { Command as Command8 } from "commander";
-import { colorize as colorize2 } from "consola/utils";
-import { config } from "dotenv";
-import { resolve } from "path";
+// src/cli/lib/logger.ts
+import { createConsola } from "consola";
+var consola = createConsola({
+  level: "3" ? parseInt("3", 10) : 3
+});
+
+// src/cli/lib/telemetry.ts
+import { Analytics } from "@segment/analytics-node";
+import { randomBytes, randomUUID } from "crypto";
 
 // package.json
 var package_default = {
   name: "@bigcommerce/catalyst",
-  version: "0.1.0",
+  version: "1.0.0-alpha.1",
   type: "module",
   bin: {
     catalyst: "dist/cli.js"
@@ -18,7 +22,6 @@ var package_default = {
     "dist",
     "templates"
   ],
-  private: true,
   scripts: {
     dev: "tsup --watch",
     typecheck: "tsc --noEmit",
@@ -39,6 +42,7 @@ var package_default = {
     consola: "^3.4.2",
     dotenv: "^16.5.0",
     execa: "^9.6.0",
+    open: "^10.1.0",
     "yocto-spinner": "^1.0.0",
     zod: "^4.0.5"
   },
@@ -58,47 +62,27 @@ var package_default = {
     vitest: "^3.2.4"
   },
   peerDependencies: {
-    "@opennextjs/cloudflare": "^1.8.0"
+    "@opennextjs/cloudflare": "1.17.3"
   }
 };
 
-// src/cli/commands/build.ts
-import { Command, Option } from "commander";
-import { execa } from "execa";
-import { existsSync } from "fs";
-import { copyFile, cp, writeFile } from "fs/promises";
-import { join as join3 } from "path";
-
-// src/cli/lib/get-module-cli-path.ts
-import { dirname, join } from "path";
-import { fileURLToPath } from "url";
-function getModuleCliPath() {
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = dirname(__filename);
-  return join(__dirname, "..");
-}
-
-// src/cli/lib/logger.ts
-import { createConsola } from "consola";
-var consola = createConsola({
-  level: "3" ? parseInt("3", 10) : 3
-});
-
 // src/cli/lib/project-config.ts
 import Conf from "conf";
-import { join as join2 } from "path";
-function getProjectConfig(rootDir = process.cwd()) {
+import { join } from "path";
+function getProjectConfig() {
   return new Conf({
-    cwd: join2(rootDir, ".bigcommerce"),
+    cwd: join(process.cwd(), ".bigcommerce"),
     projectSuffix: "",
     configName: "project",
     schema: {
       projectUuid: { type: "string", format: "uuid" },
       framework: {
         type: "string",
-        enum: ["catalyst", "nextjs"],
-        default: "nextjs"
+        enum: ["catalyst"],
+        default: "catalyst"
       },
+      storeHash: { type: "string" },
+      accessToken: { type: "string" },
       telemetry: {
         type: "object",
         properties: {
@@ -110,177 +94,12 @@ function getProjectConfig(rootDir = process.cwd()) {
   });
 }
 
-// src/cli/lib/wrangler-config.ts
-function getWranglerConfig(projectUuid, kvNamespaceId) {
-  return {
-    $schema: "node_modules/wrangler/config-schema.json",
-    main: "../.open-next/worker.js",
-    name: `project-${projectUuid}`,
-    compatibility_date: "2025-07-15",
-    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}`
-      }
-    ],
-    kv_namespaces: [
-      {
-        binding: "NEXT_INC_CACHE_KV",
-        id: kvNamespaceId
-      }
-    ],
-    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.24.3";
-var build = new Command("build").allowUnknownOption().argument(
-  "[next-build-options...]",
-  "Next.js `build` options (see: https://nextjs.org/docs/app/api-reference/cli/next#next-build-options)"
-).addOption(
-  new Option(
-    "--project-uuid <uuid>",
-    "Project UUID to be included in the deployment configuration."
-  ).env("BIGCOMMERCE_PROJECT_UUID")
-).addOption(
-  new Option("--framework <framework>", "The framework to use for the build.").choices([
-    "nextjs",
-    "catalyst"
-  ])
-).action(async (nextBuildOptions, options) => {
-  const coreDir = process.cwd();
-  try {
-    const config2 = getProjectConfig();
-    const framework = options.framework ?? config2.get("framework");
-    if (framework === "nextjs") {
-      const nextBin = join3("node_modules", ".bin", "next");
-      if (!existsSync(nextBin)) {
-        throw new Error(
-          `Next.js is not installed in ${coreDir}. Are you in a valid Next.js project?`
-        );
-      }
-      await execa(nextBin, ["build", ...nextBuildOptions], {
-        stdio: "inherit",
-        cwd: coreDir
-      });
-    }
-    if (framework === "catalyst") {
-      const openNextOutDir = join3(coreDir, ".open-next");
-      const bigcommerceDistDir = join3(coreDir, ".bigcommerce", "dist");
-      const projectUuid = options.projectUuid ?? config2.get("projectUuid");
-      if (!projectUuid) {
-        throw new Error(
-          "Project UUID is required. Please run `catalyst project create` or `catalyst project link` or this command again with --project-uuid <uuid>."
-        );
-      }
-      const wranglerConfig = getWranglerConfig(projectUuid, "PLACEHOLDER_KV_ID");
-      consola.start("Copying templates...");
-      await copyFile(
-        join3(getModuleCliPath(), "templates", "open-next.config.ts"),
-        join3(coreDir, ".bigcommerce", "open-next.config.ts")
-      );
-      await writeFile(
-        join3(coreDir, ".bigcommerce", "wrangler.jsonc"),
-        JSON.stringify(wranglerConfig, null, 2)
-      );
-      consola.success("Templates copied");
-      consola.start("Building project...");
-      await execa(
-        "pnpm",
-        [
-          "exec",
-          "opennextjs-cloudflare",
-          "build",
-          "--skipWranglerConfigCheck",
-          "--openNextConfigPath",
-          join3(coreDir, ".bigcommerce", "open-next.config.ts")
-        ],
-        {
-          stdout: ["pipe", "inherit"],
-          cwd: coreDir
-        }
-      );
-      await execa(
-        "pnpm",
-        [
-          "dlx",
-          `wrangler@${WRANGLER_VERSION}`,
-          "deploy",
-          "--config",
-          join3(coreDir, ".bigcommerce", "wrangler.jsonc"),
-          "--keep-vars",
-          "--outdir",
-          bigcommerceDistDir,
-          "--dry-run"
-        ],
-        {
-          stdout: ["pipe", "inherit"],
-          cwd: coreDir
-        }
-      );
-      consola.success("Project built");
-      await cp(join3(openNextOutDir, "assets"), join3(bigcommerceDistDir, "assets"), {
-        recursive: true,
-        force: true
-      });
-    }
-  } catch (error) {
-    consola.error(error);
-    process.exit(1);
-  }
-});
-
-// src/cli/commands/deploy.ts
-import AdmZip from "adm-zip";
-import { Command as Command2, Option as Option2 } from "commander";
-import { access, readdir, readFile } from "fs/promises";
-import { join as join4 } from "path";
-import yoctoSpinner from "yocto-spinner";
-import { z } from "zod";
-
 // src/cli/lib/telemetry.ts
-import { Analytics } from "@segment/analytics-node";
-import { randomBytes } from "crypto";
 var TELEMETRY_KEY_ENABLED = "telemetry.enabled";
 var TELEMETRY_KEY_ID = `telemetry.anonymousId`;
 var Telemetry = class {
   constructor() {
+    this.commandName = "unknown";
     this.projectName = "catalyst-cli";
     this.projectVersion = package_default.version;
     this.setEnabled = (_enabled) => {
@@ -289,11 +108,15 @@ var Telemetry = class {
     };
     this.CATALYST_TELEMETRY_DISABLED = process.env.CATALYST_TELEMETRY_DISABLED;
     this.projectConfig = getProjectConfig();
-    this.sessionId = randomBytes(32).toString("hex");
+    this.sessionId = randomUUID();
+    this.startTime = Date.now();
     this.analytics = new Analytics({
-      writeKey: "OCkxLj3KTc1N3ebEbnFBqbhxfE3tVb3Z"
+      writeKey: "not-a-valid-segment-write-key"
     });
   }
+  durationMs() {
+    return Date.now() - this.startTime;
+  }
   async track(eventName, payload) {
     if (!this.isEnabled()) {
       return Promise.resolve(void 0);
@@ -303,7 +126,11 @@ var Telemetry = class {
       anonymousId: this.getAnonymousId(),
       properties: {
         ...payload,
-        sessionId: this.sessionId
+        sessionId: this.sessionId,
+        nodeVersion: process.version,
+        platform: process.platform,
+        arch: process.arch,
+        cliVersion: package_default.version
       },
       context: {
         app: {
@@ -344,91 +171,595 @@ var Telemetry = class {
     return generated;
   }
 };
+var telemetryInstance;
+function getTelemetry() {
+  telemetryInstance ?? (telemetryInstance = new Telemetry());
+  return telemetryInstance;
+}
 
-// src/cli/commands/deploy.ts
-var telemetry = new Telemetry();
-var stepsEnum = z.enum([
-  "initializing",
-  "downloading",
-  "unzipping",
-  "processing",
-  "deploying",
-  "finalizing",
-  "complete"
-]);
-var STEPS = {
-  initializing: "Initializing...",
-  downloading: "Downloading...",
-  unzipping: "Unzipping...",
-  processing: "Processing...",
-  deploying: "Deploying...",
-  finalizing: "Finalizing...",
-  complete: "Complete"
-};
-var UploadSignatureSchema = z.object({
-  data: z.object({
-    upload_url: z.url(),
-    upload_uuid: z.string()
-  })
+// src/cli/program.ts
+import { Option as Option8 } from "@commander-js/extra-typings";
+import { Command as Command9 } from "commander";
+import { colorize as colorize4 } from "consola/utils";
+import { config } from "dotenv";
+import { resolve } from "path";
+
+// src/cli/commands/auth.ts
+import { Command, Option } from "commander";
+import { colorize } from "consola/utils";
+import open from "open";
+import yoctoSpinner from "yocto-spinner";
+import { z as z3 } from "zod";
+
+// src/cli/lib/auth.ts
+import { z } from "zod";
+var DEVICE_OAUTH_CLIENT_ID = "s1q4io7mah2lm1i6uwp9yl1eit80n3b";
+var DEVICE_OAUTH_SCOPES = [
+  "store_v2_information",
+  "store_infrastructure_deployments_manage",
+  "store_infrastructure_logs_read_only",
+  "store_infrastructure_projects_manage"
+].join(" ");
+var DEFAULT_LOGIN_URL = "https://login.bigcommerce.com";
+var DeviceCodeResponseSchema = z.object({
+  device_code: z.string(),
+  user_code: z.string(),
+  verification_uri: z.string(),
+  expires_in: z.number(),
+  interval: z.number()
 });
-var CreateDeploymentSchema = z.object({
-  data: z.object({
-    deployment_uuid: z.uuid()
-  })
+var DeviceCodeSuccessSchema = z.object({
+  access_token: z.string(),
+  store_hash: z.string(),
+  context: z.string(),
+  api_uri: z.string()
 });
-var DeploymentStatusSchema = z.object({
-  deployment_uuid: z.uuid(),
-  deployment_status: z.enum(["queued", "in_progress", "failed", "completed"]),
-  event: z.object({
-    step: stepsEnum,
-    progress: z.number()
-  }).nullable(),
-  error: z.object({
-    code: z.number()
-  }).optional()
+async function requestDeviceCode(loginUrl) {
+  const response = await fetch(`${loginUrl}/device/token`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      client_id: DEVICE_OAUTH_CLIENT_ID,
+      scopes: DEVICE_OAUTH_SCOPES
+    })
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to request device code: ${response.status} ${response.statusText}`);
+  }
+  const res = await response.json();
+  return DeviceCodeResponseSchema.parse(res);
+}
+async function pollDeviceToken(loginUrl, deviceCode) {
+  const response = await fetch(`${loginUrl}/device/token`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      device_code: deviceCode,
+      client_id: DEVICE_OAUTH_CLIENT_ID
+    })
+  });
+  if (response.status !== 200) {
+    return null;
+  }
+  const res = await response.json();
+  return DeviceCodeSuccessSchema.parse(res);
+}
+async function waitForDeviceToken(loginUrl, deviceCode, interval) {
+  const credentials = await pollDeviceToken(loginUrl, deviceCode);
+  if (credentials) {
+    return credentials;
+  }
+  await new Promise((resolve2) => {
+    setTimeout(resolve2, interval * 1e3);
+  });
+  return waitForDeviceToken(loginUrl, deviceCode, interval);
+}
+
+// src/cli/lib/project.ts
+import { z as z2 } from "zod";
+var fetchProjectsSchema = z2.object({
+  data: z2.array(
+    z2.object({
+      uuid: z2.string(),
+      name: z2.string()
+    })
+  )
 });
-var generateBundleZip = async () => {
-  consola.info("Generating bundle...");
-  const bigcommerceDir = join4(process.cwd(), ".bigcommerce");
-  const distDir = join4(process.cwd(), ".bigcommerce", "dist");
-  try {
-    await access(distDir);
-  } catch {
-    throw new Error(`Dist directory not found: ${distDir}`);
+async function fetchProjects(storeHash, accessToken, apiHost) {
+  const response = await fetch(
+    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/projects`,
+    {
+      method: "GET",
+      headers: {
+        "X-Auth-Token": accessToken,
+        "X-Correlation-Id": getTelemetry().sessionId
+      }
+    }
+  );
+  if (response.status === 403) {
+    throw new Error(
+      "Infrastructure Projects API not enabled. If you are part of the alpha, contact support@bigcommerce.com to enable it."
+    );
   }
-  const buildDirContents = await readdir(distDir);
-  if (buildDirContents.length === 0) {
-    throw new Error(`Dist directory is empty: ${distDir}`);
+  if (!response.ok) {
+    throw new Error(`Failed to fetch projects: ${response.statusText}`);
   }
-  const outputZip = join4(bigcommerceDir, "bundle.zip");
-  const zip = new AdmZip();
-  zip.addLocalFolder(distDir, "output");
-  zip.writeZip(outputZip);
-  consola.success(`Bundle created at: ${outputZip}`);
-};
-var generateUploadSignature = async (storeHash, accessToken, apiHost) => {
-  consola.info("Generating upload signature...");
+  const res = await response.json();
+  const { data } = fetchProjectsSchema.parse(res);
+  return data;
+}
+var createProjectSchema = z2.object({
+  data: z2.object({
+    uuid: z2.string(),
+    name: z2.string(),
+    date_created: z2.coerce.date(),
+    date_modified: z2.coerce.date()
+  })
+});
+async function createProject(name, storeHash, accessToken, apiHost) {
   const response = await fetch(
-    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/deployments/uploads`,
+    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/projects`,
     {
       method: "POST",
       headers: {
         "X-Auth-Token": accessToken,
+        Accept: "application/json",
         "Content-Type": "application/json",
-        Accept: "application/json"
+        "X-Correlation-Id": getTelemetry().sessionId
       },
-      body: JSON.stringify({})
+      body: JSON.stringify({ name })
     }
   );
+  if (response.status === 502) {
+    throw new Error("Failed to create project, is the name already in use?");
+  }
+  if (response.status === 403) {
+    throw new Error(
+      "Infrastructure Projects API not enabled. If you are part of the alpha, contact support@bigcommerce.com to enable it."
+    );
+  }
+  if (response.status === 422) {
+    throw new Error(
+      "The project name you entered doesn't meet the requirements. It must be 3\u201332 characters long and use only letters, numbers, hyphens (-), underscores (_), and periods (.)"
+    );
+  }
   if (!response.ok) {
-    throw new Error(`Failed to fetch upload signature: ${response.status} ${response.statusText}`);
+    throw new Error(`Failed to create project: ${response.statusText}`);
   }
   const res = await response.json();
-  const { data } = UploadSignatureSchema.parse(res);
-  consola.success("Upload signature generated.");
+  const { data } = createProjectSchema.parse(res);
   return data;
-};
-var uploadBundleZip = async (uploadUrl) => {
+}
+
+// src/cli/commands/auth.ts
+var StoreProfileSchema = z3.object({
+  data: z3.object({
+    store_name: z3.string()
+  })
+});
+async function fetchStoreProfile(storeHash, accessToken, apiHost) {
+  const response = await fetch(`https://${apiHost}/stores/${storeHash}/v3/settings/store/profile`, {
+    method: "GET",
+    headers: {
+      "X-Auth-Token": accessToken,
+      Accept: "application/json"
+    }
+  });
+  if (!response.ok) {
+    throw new Error(`${response.status} ${response.statusText}`);
+  }
+  const res = await response.json();
+  const result = StoreProfileSchema.safeParse(res);
+  if (!result.success) {
+    throw new Error("Unexpected response from store profile API");
+  }
+  return result.data.data;
+}
+var whoami = new Command("whoami").description("Verify stored credentials and display store/project info.").addOption(
+  new Option(
+    "--store-hash <hash>",
+    "BigCommerce store hash. Can be found in the URL of your store Control Panel."
+  ).env("CATALYST_STORE_HASH")
+).addOption(
+  new Option(
+    "--access-token <token>",
+    "BigCommerce access token. Can be found after creating a store-level API account."
+  ).env("CATALYST_ACCESS_TOKEN")
+).addOption(
+  new Option("--api-host <host>", "BigCommerce API host. The default is api.bigcommerce.com.").env("BIGCOMMERCE_API_HOST").default("api.bigcommerce.com")
+).action(async (options) => {
+  try {
+    const config2 = getProjectConfig();
+    const storeHash = options.storeHash ?? config2.get("storeHash");
+    const accessToken = options.accessToken ?? config2.get("accessToken");
+    if (!storeHash || !accessToken) {
+      consola.info("Not logged in: no credentials found.");
+      consola.info(
+        "Run `catalyst auth login`, or provide --store-hash and --access-token flags (or set CATALYST_STORE_HASH and CATALYST_ACCESS_TOKEN environment variables)."
+      );
+      process.exit(1);
+      return;
+    }
+    const store = await fetchStoreProfile(storeHash, accessToken, options.apiHost);
+    const projectUuid = config2.get("projectUuid");
+    if (projectUuid) {
+      const projects = await fetchProjects(storeHash, accessToken, options.apiHost);
+      const linkedProject = projects.find((p) => p.uuid === projectUuid);
+      if (linkedProject) {
+        consola.info(
+          `Logged in to ${store.store_name} (${storeHash}), connected to project ${linkedProject.name} (${projectUuid})`
+        );
+      } else {
+        consola.info(
+          `Logged in to ${store.store_name} (${storeHash}), project ${projectUuid} not found`
+        );
+      }
+    } else {
+      consola.info(`Logged in to ${store.store_name} (${storeHash})`);
+    }
+    process.exit(0);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (message.includes("401") || message.includes("403")) {
+      consola.error(`Not logged in: invalid credentials (${message})`);
+    } else {
+      consola.error(`Failed to verify credentials: ${message}`);
+    }
+    process.exit(1);
+  }
+});
+var login = new Command("login").description("Authenticate via browser using the OAuth device code flow.").addOption(
+  new Option(
+    "--store-hash <hash>",
+    "BigCommerce store hash. Can be found in the URL of your store Control Panel."
+  ).env("CATALYST_STORE_HASH")
+).addOption(
+  new Option(
+    "--access-token <token>",
+    "BigCommerce access token. Can be found after creating a store-level API account."
+  ).env("CATALYST_ACCESS_TOKEN")
+).addOption(
+  new Option("--login-url <url>", "BigCommerce login URL.").env("BIGCOMMERCE_LOGIN_URL").default(DEFAULT_LOGIN_URL)
+).action(async (options) => {
+  try {
+    const config2 = getProjectConfig();
+    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.");
+      process.exit(0);
+      return;
+    }
+    const deviceCode = await requestDeviceCode(options.loginUrl);
+    consola.info(
+      `${colorize("yellow", "Your one-time code:")} ${colorize("bold", deviceCode.user_code)}`
+    );
+    try {
+      await open(deviceCode.verification_uri);
+      consola.info(`Opened ${deviceCode.verification_uri} in your browser.`);
+    } catch {
+      consola.info(
+        `Open ${deviceCode.verification_uri} in your browser and enter the code above.`
+      );
+    }
+    const spinner = yoctoSpinner().start("Waiting for authentication...");
+    const credentials = await waitForDeviceToken(
+      options.loginUrl,
+      deviceCode.device_code,
+      deviceCode.interval
+    );
+    spinner.success("Authentication complete.");
+    config2.set("storeHash", credentials.store_hash);
+    config2.set("accessToken", credentials.access_token);
+    consola.success(`Logged in to store ${credentials.store_hash}.`);
+    process.exit(0);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    consola.error(`Login failed: ${message}`);
+    process.exit(1);
+  }
+});
+var logout = new Command("logout").description("Remove stored credentials for the current project.").action(() => {
+  try {
+    const config2 = getProjectConfig();
+    const storeHash = config2.get("storeHash");
+    const accessToken = config2.get("accessToken");
+    if (!storeHash && !accessToken) {
+      consola.info("Not logged in: no credentials found.");
+      process.exit(0);
+      return;
+    }
+    config2.delete("storeHash");
+    config2.delete("accessToken");
+    consola.success(`Logged out from store ${storeHash ?? "unknown"}.`);
+    process.exit(0);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    consola.error(`Logout failed: ${message}`);
+    process.exit(1);
+  }
+});
+var auth = new Command("auth").description("Manage authentication for the BigCommerce CLI.").addCommand(whoami).addCommand(login).addCommand(logout);
+
+// src/cli/commands/build.ts
+import { Command as Command2, Option as Option2 } from "commander";
+import { execa } from "execa";
+import { copyFile, cp, writeFile } from "fs/promises";
+import { join as join3 } from "path";
+
+// src/cli/lib/get-module-cli-path.ts
+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, "..");
+}
+
+// src/cli/lib/wrangler-config.ts
+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_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.24.3";
+async function buildCatalystProject(projectUuid) {
+  const coreDir = process.cwd();
+  const openNextOutDir = join3(coreDir, ".open-next");
+  const bigcommerceDistDir = join3(coreDir, ".bigcommerce", "dist");
+  const wranglerConfig = getWranglerConfig(projectUuid);
+  consola.start("Copying templates...");
+  await copyFile(
+    join3(getModuleCliPath(), "templates", "open-next.config.ts"),
+    join3(coreDir, ".bigcommerce", "open-next.config.ts")
+  );
+  await writeFile(
+    join3(coreDir, ".bigcommerce", "wrangler.jsonc"),
+    JSON.stringify(wranglerConfig, null, 2)
+  );
+  consola.success("Templates copied");
+  consola.start("Building project...");
+  await execa(
+    "pnpm",
+    [
+      "exec",
+      "opennextjs-cloudflare",
+      "build",
+      "--skipWranglerConfigCheck",
+      "--openNextConfigPath",
+      join3(coreDir, ".bigcommerce", "open-next.config.ts")
+    ],
+    {
+      stdout: ["pipe", "inherit"],
+      cwd: coreDir
+    }
+  );
+  await execa(
+    "pnpm",
+    [
+      "dlx",
+      `wrangler@${WRANGLER_VERSION}`,
+      "deploy",
+      "--config",
+      join3(coreDir, ".bigcommerce", "wrangler.jsonc"),
+      "--keep-vars",
+      "--outdir",
+      bigcommerceDistDir,
+      "--dry-run"
+    ],
+    {
+      stdout: ["pipe", "inherit"],
+      cwd: coreDir
+    }
+  );
+  consola.success("Project built");
+  await cp(join3(openNextOutDir, "assets"), join3(bigcommerceDistDir, "assets"), {
+    recursive: true,
+    force: true
+  });
+}
+var build = new Command2("build").addOption(
+  new Option2(
+    "--project-uuid <uuid>",
+    "Project UUID to be included in the deployment configuration."
+  ).env("CATALYST_PROJECT_UUID")
+).action(async (options) => {
+  const config2 = getProjectConfig();
+  const projectUuid = options.projectUuid ?? config2.get("projectUuid");
+  if (!projectUuid) {
+    throw new Error(
+      "Project UUID is required. Please run `catalyst project create` or `catalyst project link` or this command again with --project-uuid <uuid>."
+    );
+  }
+  await buildCatalystProject(projectUuid);
+});
+
+// src/cli/commands/deploy.ts
+import AdmZip from "adm-zip";
+import { Command as Command3, Option as Option3 } from "commander";
+import { access, readdir, readFile } from "fs/promises";
+import { join as join4 } from "path";
+import yoctoSpinner2 from "yocto-spinner";
+import { z as z4 } from "zod";
+
+// src/cli/lib/deployment-errors.ts
+var ERROR_MESSAGES = {
+  10: "Something went wrong on our end. Please try again. If the issue persists, contact support.",
+  20: "We couldn't retrieve your bundle. This is usually a temporary issue \u2014 please try deploying again. If the problem continues, contact support.",
+  30: "Your bundle could not be extracted. This may mean your build output is too large (max 64 MB compressed / 512 MB uncompressed) or the archive is corrupted. Try reducing your build size or rebuilding your project and deploying again.",
+  40: `There's a problem with your build output. This could be caused by:
+- A worker.js file larger than 40 MB
+- An individual asset file larger than 25 MB
+- More than 1,000 total files in the bundle`,
+  50: "Deployment failed. This is usually a temporary issue \u2014 please try again. If the problem persists, contact support.",
+  60: "Your code was deployed, but we couldn't determine your deployment URL. Please try deploying again. If the issue persists, contact support."
+};
+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/resolve-credentials.ts
+function resolveCredentials(options, config2) {
+  const storeHash = options.storeHash ?? config2.get("storeHash");
+  const accessToken = options.accessToken ?? config2.get("accessToken");
+  if (!storeHash || !accessToken) {
+    consola.error("Missing credentials.");
+    consola.info(
+      "Run `catalyst auth login`, or provide --store-hash and --access-token flags (or set CATALYST_STORE_HASH and CATALYST_ACCESS_TOKEN environment variables)."
+    );
+    process.exit(1);
+    throw new Error("Missing credentials");
+  }
+  return { storeHash, accessToken };
+}
+
+// src/cli/commands/deploy.ts
+var stepsEnum = z4.enum([
+  "initializing",
+  "downloading",
+  "unzipping",
+  "processing",
+  "deploying",
+  "finalizing",
+  "complete"
+]);
+var STEPS = {
+  initializing: "Initializing...",
+  downloading: "Downloading...",
+  unzipping: "Unzipping...",
+  processing: "Processing...",
+  deploying: "Deploying...",
+  finalizing: "Finalizing...",
+  complete: "Complete"
+};
+var UploadSignatureSchema = z4.object({
+  data: z4.object({
+    upload_url: z4.url(),
+    upload_uuid: z4.string()
+  })
+});
+var CreateDeploymentSchema = z4.object({
+  data: z4.object({
+    deployment_uuid: z4.uuid()
+  })
+});
+var ProjectSchema = z4.object({
+  data: z4.array(
+    z4.object({
+      uuid: z4.uuid(),
+      name: z4.string()
+    })
+  )
+});
+var DeploymentStatusSchema = z4.object({
+  deployment_uuid: z4.uuid(),
+  deployment_status: z4.enum(["queued", "in_progress", "failed", "completed"]),
+  event: z4.object({
+    step: stepsEnum,
+    progress: z4.number()
+  }).nullable(),
+  deployment_url: z4.string().nullable(),
+  error: z4.object({
+    code: z4.number()
+  }).optional()
+});
+var generateBundleZip = async () => {
+  consola.info("Generating bundle...");
+  const bigcommerceDir = join4(process.cwd(), ".bigcommerce");
+  const distDir = join4(process.cwd(), ".bigcommerce", "dist");
+  try {
+    await access(distDir);
+  } catch {
+    throw new Error(`Dist directory not found: ${distDir}`);
+  }
+  const buildDirContents = await readdir(distDir);
+  if (buildDirContents.length === 0) {
+    throw new Error(`Dist directory is empty: ${distDir}`);
+  }
+  const outputZip = join4(bigcommerceDir, "bundle.zip");
+  const zip = new AdmZip();
+  zip.addLocalFolder(distDir, "output");
+  zip.writeZip(outputZip);
+  consola.success(`Bundle created at: ${outputZip}`);
+};
+var generateUploadSignature = async (storeHash, accessToken, apiHost) => {
+  consola.info("Generating upload signature...");
+  const response = await fetch(
+    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/deployments/uploads`,
+    {
+      method: "POST",
+      headers: {
+        "X-Auth-Token": accessToken,
+        "Content-Type": "application/json",
+        Accept: "application/json",
+        "X-Correlation-Id": getTelemetry().sessionId
+      },
+      body: JSON.stringify({})
+    }
+  );
+  if (!response.ok) {
+    throw new Error(`Failed to fetch upload signature: ${response.status} ${response.statusText}`);
+  }
+  const res = await response.json();
+  const { data } = UploadSignatureSchema.parse(res);
+  consola.success("Upload signature generated.");
+  return data;
+};
+var uploadBundleZip = async (uploadUrl) => {
   consola.info("Uploading bundle...");
   const zipPath = join4(process.cwd(), ".bigcommerce", "bundle.zip");
   const fileBuffer = await readFile(zipPath);
@@ -467,7 +798,8 @@ var createDeployment = async (projectUuid, uploadUuid, storeHash, accessToken, a
       headers: {
         "X-Auth-Token": accessToken,
         "Content-Type": "application/json",
-        Accept: "application/json"
+        Accept: "application/json",
+        "X-Correlation-Id": getTelemetry().sessionId
       },
       body: JSON.stringify({
         project_uuid: projectUuid,
@@ -486,9 +818,260 @@ var createDeployment = async (projectUuid, uploadUuid, storeHash, accessToken, a
 };
 var getDeploymentStatus = async (deploymentUuid, storeHash, accessToken, apiHost) => {
   consola.info("Fetching deployment status...");
-  const spinner = yoctoSpinner().start("Fetching...");
+  const spinner = yoctoSpinner2().start("Fetching...");
+  const response = await fetch(
+    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/deployments/${deploymentUuid}/events`,
+    {
+      method: "GET",
+      headers: {
+        "X-Auth-Token": accessToken,
+        Accept: "text/event-stream",
+        Connection: "keep-alive",
+        "X-Correlation-Id": getTelemetry().sessionId
+      }
+    }
+  );
+  if (!response.ok) {
+    throw new Error(`Failed to open event stream: ${response.status} ${response.statusText}`);
+  }
+  const reader = response.body?.getReader();
+  if (!reader) {
+    throw new Error("Failed to read event stream.");
+  }
+  const decoder = new TextDecoder();
+  let done = false;
+  let deploymentUrl;
+  while (!done) {
+    const { value, done: streamDone } = await reader.read();
+    let json;
+    if (value) {
+      const chunk = decoder.decode(value, { stream: true }).trim();
+      const split = chunk.split("\n\n").map((s) => s.replace("data:", "").trim()).filter(Boolean);
+      split.forEach((event) => {
+        try {
+          json = JSON.parse(event);
+        } catch (error) {
+          consola.warn(`Failed to parse event, dropping from stream. Event: ${event}`, error);
+          return;
+        }
+        const data = DeploymentStatusSchema.parse(json);
+        if (data.error) {
+          throw new Error(
+            `Deployment failed (error code ${data.error.code}): ${getDeploymentErrorMessage(data.error.code)}`
+          );
+        }
+        if (data.event && STEPS[data.event.step] !== spinner.text) {
+          spinner.text = STEPS[data.event.step];
+        }
+        if (data.deployment_url) {
+          console.log(data.deployment_url);
+          deploymentUrl = data.deployment_url;
+        }
+      });
+    }
+    done = streamDone;
+  }
+  spinner.success("Deployment completed successfully.\n");
+  if (deploymentUrl) {
+    consola.success(`View your deployment at: ${deploymentUrl}`);
+  }
+};
+var deploy = new Command3("deploy").description("Deploy your application to Cloudflare.").addOption(
+  new Option3(
+    "--store-hash <hash>",
+    "BigCommerce store hash. Can be found in the URL of your store Control Panel. Read from .bigcommerce/project.json when not provided."
+  ).env("CATALYST_STORE_HASH")
+).addOption(
+  new Option3(
+    "--access-token <token>",
+    "BigCommerce access token. Can be found after creating a store-level API account. Read from .bigcommerce/project.json when not provided."
+  ).env("CATALYST_ACCESS_TOKEN")
+).addOption(
+  new Option3("--api-host <host>", "BigCommerce API host. The default is api.bigcommerce.com.").env("BIGCOMMERCE_API_HOST").default("api.bigcommerce.com")
+).addOption(
+  new Option3(
+    "--project-uuid <uuid>",
+    "BigCommerce intrastructure project UUID. Can be found via the BigCommerce API (GET /v3/infrastructure/projects)."
+  ).env("CATALYST_PROJECT_UUID")
+).addOption(
+  new Option3(
+    "--secret <value>",
+    "Secret to set for the deployment (repeatable). Format: --secret KEY=VALUE"
+  ).argParser((value, previous = []) => {
+    return previous.concat([value]);
+  })
+).option("--dry-run", "Run the command to generate the bundle without uploading or deploying.").option(
+  "--prebuilt",
+  "Skip the build step. Requires .bigcommerce/dist/ to already contain build output."
+).action(async (options) => {
+  const config2 = getProjectConfig();
+  const { storeHash, accessToken } = resolveCredentials(options, config2);
+  const telemetry3 = getTelemetry();
+  const projectUuid = options.projectUuid ?? config2.get("projectUuid");
+  if (!projectUuid) {
+    throw new Error(
+      "Project UUID is required. Please run either `catalyst project link` or `catalyst project create` or this command again with --project-uuid <uuid>."
+    );
+  }
+  await telemetry3.identify(storeHash);
+  if (options.prebuilt) {
+    const distDir = join4(process.cwd(), ".bigcommerce", "dist");
+    try {
+      await access(distDir);
+    } catch {
+      throw new Error(
+        "No build output found at .bigcommerce/dist/. Run `catalyst build` first or remove `--prebuilt` to build automatically."
+      );
+    }
+    const contents = await readdir(distDir);
+    if (contents.length === 0) {
+      throw new Error(
+        "No build output found at .bigcommerce/dist/. Run `catalyst build` first or remove `--prebuilt` to build automatically."
+      );
+    }
+    consola.info("Using existing build output (--prebuilt).");
+  } else {
+    await buildCatalystProject(projectUuid);
+  }
+  await generateBundleZip();
+  if (options.dryRun) {
+    consola.info("Dry run enabled \u2014 skipping upload and deployment steps.");
+    consola.info("Next steps (skipped):");
+    consola.info("- Generate upload signature");
+    consola.info("- Upload bundle.zip");
+    consola.info("- Create deployment");
+    process.exit(0);
+  }
+  const uploadSignature = await generateUploadSignature(storeHash, accessToken, options.apiHost);
+  await uploadBundleZip(uploadSignature.upload_url);
+  const environmentVariables = parseEnvironmentVariables(options.secret);
+  const { deployment_uuid: deploymentUuid } = await createDeployment(
+    projectUuid,
+    uploadSignature.upload_uuid,
+    storeHash,
+    accessToken,
+    options.apiHost,
+    environmentVariables
+  );
+  await getDeploymentStatus(deploymentUuid, storeHash, accessToken, options.apiHost);
+});
+
+// src/cli/commands/logs.ts
+import { Command as Command4, Option as Option5 } from "commander";
+import { colorize as colorize2 } from "consola/utils";
+import { z as z5 } from "zod";
+
+// src/cli/lib/shared-options.ts
+import { Option as Option4 } from "commander";
+var storeHashOption = () => new Option4(
+  "--store-hash <hash>",
+  "BigCommerce store hash. Can be found in the URL of your store Control Panel."
+).env("BIGCOMMERCE_STORE_HASH");
+var accessTokenOption = () => new Option4(
+  "--access-token <token>",
+  "BigCommerce access token. Can be found after creating a store-level API account."
+).env("BIGCOMMERCE_ACCESS_TOKEN");
+var apiHostOption = () => new Option4("--api-host <host>", "BigCommerce API host. The default is api.bigcommerce.com.").env("BIGCOMMERCE_API_HOST").default("api.bigcommerce.com");
+var projectUuidOption = () => new Option4(
+  "--project-uuid <uuid>",
+  "BigCommerce infrastructure project UUID. Can be found via the BigCommerce API (GET /v3/infrastructure/projects)."
+).env("BIGCOMMERCE_PROJECT_UUID");
+var resolveProjectUuid = (options) => {
+  const config2 = getProjectConfig();
+  const projectUuid = options.projectUuid ?? config2.get("projectUuid");
+  if (!projectUuid) {
+    throw new Error(
+      "Project UUID is required. Please run either `catalyst project link` or `catalyst project create` or this command again with --project-uuid <uuid>."
+    );
+  }
+  return projectUuid;
+};
+
+// src/cli/commands/logs.ts
+var telemetry = new Telemetry();
+var DEFAULT_CONNECTION_TTL_MS = 1 * 60 * 1e3;
+var MAX_RETRIES = 5;
+var isFatalStatusCode = (status) => status >= 400 && status < 500;
+var LEVEL_COLORS = {
+  INFO: "green",
+  WARN: "yellow",
+  ERROR: "red",
+  DEBUG: "gray"
+};
+var LogEventSchema = z5.object({
+  uuid: z5.string(),
+  project_uuid: z5.string(),
+  request: z5.object({
+    method: z5.string(),
+    url: z5.string(),
+    status_code: z5.number()
+  }),
+  logs: z5.array(
+    z5.object({
+      timestamp: z5.string(),
+      level: z5.string(),
+      messages: z5.array(z5.unknown())
+    })
+  ),
+  exceptions: z5.array(z5.unknown()),
+  timestamp: z5.string()
+}).loose();
+var StreamError = class extends Error {
+  constructor(message, fatal) {
+    super(message);
+    this.fatal = fatal;
+  }
+};
+var formatMessages = (messages) => messages.map((m) => typeof m === "string" ? m : JSON.stringify(m)).join(" ");
+var formatLogEvent = (event, format) => {
+  const { request, logs: logEntries, exceptions } = event;
+  logEntries.forEach((entry) => {
+    const msg = formatMessages(entry.messages);
+    const level = entry.level.toUpperCase();
+    const coloredLevel = colorize2(LEVEL_COLORS[level] ?? "white", level);
+    switch (format) {
+      case "short":
+        consola.log(msg);
+        break;
+      case "request":
+        consola.log(
+          `[${entry.timestamp}] [${coloredLevel}] ${request.method} ${request.url} (${request.status_code}) ${msg}`
+        );
+        break;
+      default:
+        consola.log(`[${entry.timestamp}] [${coloredLevel}] ${msg}`);
+        break;
+    }
+  });
+  exceptions.forEach((exception) => {
+    consola.error(`[${event.timestamp}] EXCEPTION`, exception);
+  });
+};
+var parseSSEEvent = (raw) => {
+  const joined = raw.split("\n").flatMap((line) => line.startsWith("data:") ? [line.slice(5).trim()] : []).join("\n");
+  return joined.length > 0 ? joined : null;
+};
+var processLogEvent = (event, format) => {
+  if (format === "json") {
+    process.stdout.write(`${event}
+`);
+    return;
+  }
+  try {
+    const parsed = JSON.parse(event);
+    const logEvent = LogEventSchema.parse(parsed);
+    if (format === "pretty") {
+      consola.log(JSON.stringify(logEvent, null, 2));
+    } else {
+      formatLogEvent(logEvent, format);
+    }
+  } catch {
+    consola.warn(`Failed to parse log event: ${event}`);
+  }
+};
+var openLogStream = async (projectUuid, storeHash, accessToken, apiHost) => {
   const response = await fetch(
-    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/deployments/${deploymentUuid}/events`,
+    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/logs/${projectUuid}/tail`,
     {
       method: "GET",
       headers: {
@@ -499,443 +1082,263 @@ var getDeploymentStatus = async (deploymentUuid, storeHash, accessToken, apiHost
     }
   );
   if (!response.ok) {
-    throw new Error(`Failed to open event stream: ${response.status} ${response.statusText}`);
+    throw new StreamError(
+      `Failed to open log stream: ${response.status} ${response.statusText}`,
+      isFatalStatusCode(response.status)
+    );
   }
   const reader = response.body?.getReader();
   if (!reader) {
-    throw new Error("Failed to read event stream.");
+    throw new StreamError("Failed to read log stream.", true);
   }
-  const decoder = new TextDecoder();
-  let done = false;
-  while (!done) {
-    const { value, done: streamDone } = await reader.read();
-    let json;
-    if (value) {
-      const chunk = decoder.decode(value, { stream: true }).trim();
-      const split = chunk.split("\n\n").map((s) => s.replace("data:", "").trim()).filter(Boolean);
-      split.forEach((event) => {
-        try {
-          json = JSON.parse(event);
-        } catch (error) {
-          consola.warn(`Failed to parse event, dropping from stream. Event: ${event}`, error);
-          return;
+  return reader;
+};
+var tailLogs = async (projectUuid, storeHash, accessToken, apiHost, format, connectionTtlMs = DEFAULT_CONNECTION_TTL_MS) => {
+  consola.info("Tailing logs...");
+  let retries = 0;
+  while (true) {
+    try {
+      const reader = await openLogStream(projectUuid, storeHash, accessToken, apiHost);
+      const decoder = new TextDecoder();
+      const connectTime = Date.now();
+      let buffer = "";
+      retries = 0;
+      while (true) {
+        const { value, done: streamDone } = await reader.read();
+        if (value) {
+          buffer += decoder.decode(value, { stream: true });
+          const parts = buffer.split("\n\n");
+          buffer = parts.pop() ?? "";
+          parts.map((raw) => parseSSEEvent(raw)).filter((event) => event !== null).forEach((event) => processLogEvent(event, format));
         }
-        const data = DeploymentStatusSchema.parse(json);
-        if (data.error) {
-          throw new Error(`Deployment failed with error code: ${data.error.code}`);
+        if (streamDone || Date.now() - connectTime >= connectionTtlMs) {
+          void reader.cancel();
+          break;
         }
-        if (data.event && STEPS[data.event.step] !== spinner.text) {
-          spinner.text = STEPS[data.event.step];
+      }
+    } catch (error) {
+      if (error instanceof StreamError && error.fatal) {
+        throw error;
+      }
+      const isServerDisconnect = error instanceof TypeError && error.message === "terminated";
+      if (isServerDisconnect) {
+        consola.warn("Log stream closed by server, reconnecting...");
+      } else {
+        retries += 1;
+        if (retries >= MAX_RETRIES) {
+          throw new Error(`Failed to connect to log stream after ${MAX_RETRIES} retries.`);
         }
-      });
+        consola.warn(
+          `Log stream disconnected, reconnecting (attempt ${retries}/${MAX_RETRIES})...`,
+          error
+        );
+      }
     }
-    done = streamDone;
   }
-  spinner.success("Deployment completed successfully.");
 };
-var deploy = new Command2("deploy").description("Deploy your application to Cloudflare.").addOption(
-  new Option2(
-    "--store-hash <hash>",
-    "BigCommerce store hash. Can be found in the URL of your store Control Panel."
-  ).env("BIGCOMMERCE_STORE_HASH").makeOptionMandatory()
-).addOption(
-  new Option2(
-    "--access-token <token>",
-    "BigCommerce access token. Can be found after creating a store-level API account."
-  ).env("BIGCOMMERCE_ACCESS_TOKEN").makeOptionMandatory()
-).addOption(
-  new Option2("--api-host <host>", "BigCommerce API host. The default is api.bigcommerce.com.").env("BIGCOMMERCE_API_HOST").default("api.bigcommerce.com")
-).addOption(
-  new Option2(
-    "--project-uuid <uuid>",
-    "BigCommerce intrastructure project UUID. Can be found via the BigCommerce API (GET /v3/infrastructure/projects)."
-  ).env("BIGCOMMERCE_PROJECT_UUID")
-).addOption(
-  new Option2(
-    "--secret <secrets...>",
-    "Secrets to set for the deployment. Format: SECRET_1=FOO SECRET_2=BAR"
-  )
-).option("--dry-run", "Run the command to generate the bundle without uploading or deploying.").action(async (options) => {
+var tail = new Command4("tail").description("Tail live logs from your deployed application.").addOption(storeHashOption().makeOptionMandatory()).addOption(accessTokenOption().makeOptionMandatory()).addOption(apiHostOption()).addOption(projectUuidOption()).addOption(
+  new Option5("--format <format>", "Output format for log events.").choices(["json", "pretty", "default", "short", "request"]).default("default")
+).action(async (options) => {
   try {
-    const config2 = getProjectConfig();
     await telemetry.identify(options.storeHash);
-    const projectUuid = options.projectUuid ?? config2.get("projectUuid");
-    if (!projectUuid) {
-      throw new Error(
-        "Project UUID is required. Please run either `catalyst project link` or `catalyst project create` or this command again with --project-uuid <uuid>."
-      );
-    }
-    await generateBundleZip();
-    if (options.dryRun) {
-      consola.info("Dry run enabled \u2014 skipping upload and deployment steps.");
-      consola.info("Next steps (skipped):");
-      consola.info("- Generate upload signature");
-      consola.info("- Upload bundle.zip");
-      consola.info("- Create deployment");
-      process.exit(0);
-    }
-    const uploadSignature = await generateUploadSignature(
-      options.storeHash,
-      options.accessToken,
-      options.apiHost
-    );
-    await uploadBundleZip(uploadSignature.upload_url);
-    const environmentVariables = parseEnvironmentVariables(options.secret);
-    const { deployment_uuid: deploymentUuid } = await createDeployment(
+    const projectUuid = resolveProjectUuid(options);
+    await tailLogs(
       projectUuid,
-      uploadSignature.upload_uuid,
       options.storeHash,
       options.accessToken,
       options.apiHost,
-      environmentVariables
-    );
-    await getDeploymentStatus(
-      deploymentUuid,
-      options.storeHash,
-      options.accessToken,
-      options.apiHost
+      options.format
     );
   } catch (error) {
     consola.error(error);
     process.exit(1);
   }
 });
-
-// src/cli/commands/dev.ts
-import { Command as Command3 } from "commander";
-import { execa as execa2 } from "execa";
-import { existsSync as existsSync2 } from "fs";
-import { join as join5 } from "path";
-var dev = new Command3("dev").description("Start the Catalyst development server.").helpOption(false).allowUnknownOption(true).argument(
-  "[options...]",
-  "Next.js `dev` options (see: https://nextjs.org/docs/app/api-reference/cli/next#next-dev-options)"
-).action(async (options) => {
-  try {
-    const nextBin = join5("node_modules", ".bin", "next");
-    if (!existsSync2(nextBin)) {
-      throw new Error(
-        `Next.js is not installed in ${process.cwd()}. Are you in a valid Next.js project?`
-      );
-    }
-    await execa2(nextBin, ["dev", ...options], {
-      stdio: "inherit",
-      cwd: process.cwd()
-    });
-  } catch (error) {
-    consola.error(error instanceof Error ? error.message : error);
-    process.exit(1);
-  }
-});
-
-// src/cli/commands/project.ts
-import { Command as Command4, Option as Option3 } from "commander";
-
-// src/cli/lib/project.ts
-import { z as z2 } from "zod";
-var fetchProjectsSchema = z2.object({
-  data: z2.array(
-    z2.object({
-      uuid: z2.string(),
-      name: z2.string()
-    })
-  )
-});
-async function fetchProjects(storeHash, accessToken, apiHost) {
-  const response = await fetch(
-    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/projects`,
-    {
-      method: "GET",
-      headers: {
-        "X-Auth-Token": accessToken
-      }
-    }
-  );
-  if (response.status === 403) {
-    throw new Error(
-      "Infrastructure Projects API not enabled. If you are part of the alpha, contact support@bigcommerce.com to enable it."
-    );
-  }
-  if (!response.ok) {
-    throw new Error(`Failed to fetch projects: ${response.statusText}`);
-  }
-  const res = await response.json();
-  const { data } = fetchProjectsSchema.parse(res);
-  return data;
-}
-var createProjectSchema = z2.object({
-  data: z2.object({
-    uuid: z2.string(),
-    name: z2.string(),
-    date_created: z2.coerce.date(),
-    date_modified: z2.coerce.date()
-  })
+var query = new Command4("query").description("Query historical logs from your deployed application.").addOption(storeHashOption().makeOptionMandatory()).addOption(accessTokenOption().makeOptionMandatory()).addOption(apiHostOption()).addOption(projectUuidOption()).action((_options) => {
+  consola.error("The query command is not yet implemented.");
+  process.exit(1);
 });
-async function createProject(name, storeHash, accessToken, apiHost) {
-  const response = await fetch(
-    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/projects`,
-    {
-      method: "POST",
-      headers: {
-        "X-Auth-Token": accessToken,
-        Accept: "application/json",
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({ name })
-    }
-  );
-  if (response.status === 502) {
-    throw new Error("Failed to create project, is the name already in use?");
-  }
-  if (response.status === 403) {
-    throw new Error(
-      "Infrastructure Projects API not enabled. If you are part of the alpha, contact support@bigcommerce.com to enable it."
-    );
-  }
-  if (!response.ok) {
-    throw new Error(`Failed to create project: ${response.statusText}`);
-  }
-  const res = await response.json();
-  const { data } = createProjectSchema.parse(res);
-  return data;
-}
+var logs = new Command4("logs").description("View logs from your deployed application.").addCommand(tail, { isDefault: true }).addCommand(query);
 
 // src/cli/commands/project.ts
-var telemetry2 = new Telemetry();
-var list = new Command4("list").description("List BigCommerce infrastructure projects for your store.").addOption(
-  new Option3(
+import { Command as Command5, Option as Option6 } from "commander";
+var list = new Command5("list").description("List BigCommerce infrastructure projects for your store.").addOption(
+  new Option6(
     "--store-hash <hash>",
     "BigCommerce store hash. Can be found in the URL of your store Control Panel."
-  ).env("BIGCOMMERCE_STORE_HASH")
+  ).env("CATALYST_STORE_HASH")
 ).addOption(
-  new Option3(
+  new Option6(
     "--access-token <token>",
     "BigCommerce access token. Can be found after creating a store-level API account."
-  ).env("BIGCOMMERCE_ACCESS_TOKEN")
+  ).env("CATALYST_ACCESS_TOKEN")
 ).addOption(
-  new Option3("--api-host <host>", "BigCommerce API host. The default is api.bigcommerce.com.").env("BIGCOMMERCE_API_HOST").default("api.bigcommerce.com")
+  new Option6("--api-host <host>", "BigCommerce API host. The default is api.bigcommerce.com.").env("BIGCOMMERCE_API_HOST").default("api.bigcommerce.com")
 ).action(async (options) => {
-  try {
-    if (!options.storeHash || !options.accessToken) {
-      consola.error("Insufficient information to list projects.");
-      consola.info(
-        "Provide both --store-hash and --access-token (or set BIGCOMMERCE_STORE_HASH and BIGCOMMERCE_ACCESS_TOKEN)."
-      );
-      process.exit(1);
-      return;
-    }
-    await telemetry2.identify(options.storeHash);
-    consola.start("Fetching projects...");
-    const projects = await fetchProjects(options.storeHash, options.accessToken, options.apiHost);
-    consola.success("Projects fetched.");
-    if (projects.length === 0) {
-      consola.info("No projects found.");
-      process.exit(0);
-      return;
-    }
-    projects.forEach((p) => {
-      consola.log(`${p.name} (${p.uuid})`);
-    });
+  const config2 = getProjectConfig();
+  const { storeHash, accessToken } = resolveCredentials(options, config2);
+  await getTelemetry().identify(storeHash);
+  consola.start("Fetching projects...");
+  const projects = await fetchProjects(storeHash, accessToken, options.apiHost);
+  consola.success("Projects fetched.");
+  if (projects.length === 0) {
+    consola.info("No projects found.");
     process.exit(0);
-  } catch (error) {
-    consola.error(error instanceof Error ? error.message : error);
-    process.exit(1);
+    return;
   }
+  projects.forEach((p) => {
+    consola.log(`${p.name} (${p.uuid})`);
+  });
+  process.exit(0);
 });
-var create = new Command4("create").description(
+var create = new Command5("create").description(
   "Create a new BigCommerce infrastructure project and link it to your local Catalyst project."
 ).addOption(
-  new Option3(
+  new Option6(
     "--store-hash <hash>",
     "BigCommerce store hash. Can be found in the URL of your store Control Panel."
-  ).env("BIGCOMMERCE_STORE_HASH")
+  ).env("CATALYST_STORE_HASH")
 ).addOption(
-  new Option3(
+  new Option6(
     "--access-token <token>",
     "BigCommerce access token. Can be found after creating a store-level API account."
-  ).env("BIGCOMMERCE_ACCESS_TOKEN")
+  ).env("CATALYST_ACCESS_TOKEN")
 ).addOption(
-  new Option3("--api-host <host>", "BigCommerce API host. The default is api.bigcommerce.com.").env("BIGCOMMERCE_API_HOST").default("api.bigcommerce.com")
-).option(
-  "--root-dir <path>",
-  "Path to the root directory of your Catalyst project (default: current working directory).",
-  process.cwd()
+  new Option6("--api-host <host>", "BigCommerce API host. The default is api.bigcommerce.com.").env("BIGCOMMERCE_API_HOST").default("api.bigcommerce.com")
 ).action(async (options) => {
-  try {
-    if (!options.storeHash || !options.accessToken) {
-      consola.error("Insufficient information to create a project.");
-      consola.info(
-        "Provide both --store-hash and --access-token (or set BIGCOMMERCE_STORE_HASH and BIGCOMMERCE_ACCESS_TOKEN)."
-      );
-      process.exit(1);
-      return;
-    }
-    await telemetry2.identify(options.storeHash);
-    const newProjectName = await consola.prompt("Enter a name for the new project:", {
-      type: "text"
-    });
-    const data = await createProject(
-      newProjectName,
-      options.storeHash,
-      options.accessToken,
-      options.apiHost
-    );
-    consola.success(`Project "${data.name}" created successfully.`);
-    const config2 = getProjectConfig(options.rootDir);
-    consola.start("Writing project UUID to .bigcommerce/project.json...");
-    config2.set("projectUuid", data.uuid);
-    config2.set("framework", "catalyst");
-    consola.success("Project UUID written to .bigcommerce/project.json.");
-    process.exit(0);
-  } catch (error) {
-    consola.error(error instanceof Error ? error.message : error);
-    process.exit(1);
-  }
+  const config2 = getProjectConfig();
+  const { storeHash, accessToken } = resolveCredentials(options, config2);
+  await getTelemetry().identify(storeHash);
+  const newProjectName = await consola.prompt("Enter a name for the new project:", {
+    type: "text"
+  });
+  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...");
+  config2.set("projectUuid", data.uuid);
+  config2.set("storeHash", storeHash);
+  config2.set("accessToken", accessToken);
+  consola.success("Project UUID written to .bigcommerce/project.json.");
+  process.exit(0);
 });
-var link = new Command4("link").description(
+var link = new Command5("link").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."
 ).addOption(
-  new Option3(
+  new Option6(
     "--store-hash <hash>",
     "BigCommerce store hash. Can be found in the URL of your store Control Panel."
-  ).env("BIGCOMMERCE_STORE_HASH")
+  ).env("CATALYST_STORE_HASH")
 ).addOption(
-  new Option3(
+  new Option6(
     "--access-token <token>",
     "BigCommerce access token. Can be found after creating a store-level API account."
-  ).env("BIGCOMMERCE_ACCESS_TOKEN")
+  ).env("CATALYST_ACCESS_TOKEN")
 ).addOption(
-  new Option3("--api-host <host>", "BigCommerce API host. The default is api.bigcommerce.com.").env("BIGCOMMERCE_API_HOST").default("api.bigcommerce.com")
+  new Option6("--api-host <host>", "BigCommerce API host. The default is api.bigcommerce.com.").env("BIGCOMMERCE_API_HOST").default("api.bigcommerce.com")
 ).option(
   "--project-uuid <uuid>",
   "BigCommerce infrastructure project UUID. Can be found via the BigCommerce API (GET /v3/infrastructure/projects). Use this to link directly without fetching projects."
-).option(
-  "--root-dir <path>",
-  "Path to the root directory of your Catalyst project (default: current working directory).",
-  process.cwd()
 ).action(async (options) => {
-  try {
-    const config2 = getProjectConfig(options.rootDir);
-    const writeProjectConfig = (uuid) => {
-      consola.start("Writing project UUID to .bigcommerce/project.json...");
-      config2.set("projectUuid", uuid);
-      config2.set("framework", "catalyst");
-      consola.success("Project UUID written to .bigcommerce/project.json.");
-    };
-    if (options.projectUuid) {
-      writeProjectConfig(options.projectUuid);
-      process.exit(0);
+  const config2 = getProjectConfig();
+  const writeProjectConfig = (uuid, credentials) => {
+    consola.start("Writing project UUID to .bigcommerce/project.json...");
+    config2.set("projectUuid", uuid);
+    if (credentials) {
+      config2.set("storeHash", credentials.storeHash);
+      config2.set("accessToken", credentials.accessToken);
     }
-    if (options.storeHash && options.accessToken) {
-      await telemetry2.identify(options.storeHash);
-      consola.start("Fetching projects...");
-      const projects = await fetchProjects(
-        options.storeHash,
-        options.accessToken,
-        options.apiHost
-      );
-      consola.success("Projects fetched.");
-      const promptOptions = [
-        ...projects.map((proj) => ({
-          label: proj.name,
-          value: proj.uuid,
-          hint: proj.uuid
-        })),
-        {
-          label: "Create a new project",
-          value: "create",
-          hint: "Create a new infrastructure project for this BigCommerce store."
-        }
-      ];
-      let projectUuid = await consola.prompt(
-        "Select a project or create a new project (Press <enter> to select).",
-        {
-          type: "select",
-          options: promptOptions,
-          cancel: "reject"
-        }
-      );
-      if (projectUuid === "create") {
-        const newProjectName = await consola.prompt("Enter a name for the new project:", {
-          type: "text"
-        });
-        const data = await createProject(
-          newProjectName,
-          options.storeHash,
-          options.accessToken,
-          options.apiHost
-        );
-        projectUuid = data.uuid;
-        consola.success(`Project "${data.name}" created successfully.`);
-      }
-      writeProjectConfig(projectUuid);
-      process.exit(0);
+    consola.success("Project UUID written to .bigcommerce/project.json.");
+  };
+  if (options.projectUuid) {
+    writeProjectConfig(options.projectUuid);
+    process.exit(0);
+    return;
+  }
+  const { storeHash, accessToken } = resolveCredentials(options, config2);
+  await getTelemetry().identify(storeHash);
+  consola.start("Fetching projects...");
+  const projects = await fetchProjects(storeHash, accessToken, options.apiHost);
+  consola.success("Projects fetched.");
+  const promptOptions = [
+    ...projects.map((proj) => ({
+      label: proj.name,
+      value: proj.uuid,
+      hint: proj.uuid
+    })),
+    {
+      label: "Create a new project",
+      value: "create",
+      hint: "Create a new infrastructure project for this BigCommerce store."
     }
-    consola.error("Insufficient information to link a project.");
-    consola.info("Provide a project UUID with --project-uuid, or");
-    consola.info("Provide both --store-hash and --access-token to fetch and select a project.");
-    process.exit(1);
-  } catch (error) {
-    consola.error(error instanceof Error ? error.message : error);
-    process.exit(1);
+  ];
+  let projectUuid = await consola.prompt(
+    "Select a project or create a new project (Press <enter> to select).",
+    {
+      type: "select",
+      options: promptOptions,
+      cancel: "reject"
+    }
+  );
+  if (projectUuid === "create") {
+    const newProjectName = await consola.prompt("Enter a name for the new project:", {
+      type: "text"
+    });
+    const data = await createProject(newProjectName, storeHash, accessToken, options.apiHost);
+    projectUuid = data.uuid;
+    consola.success(`Project "${data.name}" created successfully.`);
   }
+  writeProjectConfig(projectUuid, { storeHash, accessToken });
+  process.exit(0);
 });
-var project = new Command4("project").description("Manage your BigCommerce infrastructure project.").addCommand(create).addCommand(list).addCommand(link);
+var project = new Command5("project").description("Manage your BigCommerce infrastructure project.").addCommand(create).addCommand(list).addCommand(link);
 
 // src/cli/commands/start.ts
-import { Command as Command5, Option as Option4 } from "commander";
-import { execa as execa3 } from "execa";
-import { existsSync as existsSync3 } from "fs";
-import { join as join6 } from "path";
-var start = new Command5("start").description("Start your Catalyst storefront in optimized production mode.").allowUnknownOption(true).argument(
-  "[start-options...]",
-  "Pass additional options to the start command. If framework is Next.js, see https://nextjs.org/docs/api-reference/cli#start for available options."
-).addOption(
-  new Option4("--framework <framework>", "The framework to use for the preview").choices([
-    "catalyst",
-    "nextjs"
-  ])
-).action(async (startOptions, options) => {
-  try {
-    const config2 = getProjectConfig();
-    const framework = options.framework ?? config2.get("framework");
-    if (framework === "nextjs") {
-      const nextBin = join6("node_modules", ".bin", "next");
-      if (!existsSync3(nextBin)) {
-        throw new Error(
-          `Next.js is not installed in ${process.cwd()}. Are you in a valid Next.js project?`
-        );
-      }
-      await execa3(nextBin, ["start", ...startOptions], {
-        stdio: "inherit",
-        cwd: process.cwd()
-      });
+import { Command as Command6 } from "commander";
+import { execa as execa2 } from "execa";
+import { existsSync, lstatSync, symlinkSync } from "fs";
+import { join as join5, relative } from "path";
+var start = new Command6("start").description(
+  "Start a local preview of your Catalyst storefront using the OpenNext Cloudflare adapter."
+).action(async () => {
+  const envLocal = join5(process.cwd(), ".env.local");
+  const devVars = join5(process.cwd(), ".bigcommerce", ".dev.vars");
+  if (existsSync(envLocal)) {
+    if (!existsSync(devVars)) {
+      const target = relative(join5(process.cwd(), ".bigcommerce"), envLocal);
+      symlinkSync(target, devVars);
+      consola.success("Symlinked .bigcommerce/.dev.vars \u2192 .env.local");
+    } else if (!lstatSync(devVars).isSymbolicLink()) {
+      consola.warn(
+        ".bigcommerce/.dev.vars already exists and is not a symlink. Wrangler will use it instead of .env.local."
+      );
     }
-    await execa3(
-      "pnpm",
-      [
-        "exec",
-        "opennextjs-cloudflare",
-        "preview",
-        "--config",
-        join6(".bigcommerce", "wrangler.jsonc"),
-        ...startOptions
-      ],
-      {
-        stdio: "inherit",
-        cwd: process.cwd()
-      }
+  } else {
+    consola.warn(
+      "No .env.local file found. The preview server may fail without environment variables.\nCreate a .env.local file in your project root with the required variables."
     );
-  } catch (error) {
-    consola.error(error instanceof Error ? error.message : error);
   }
+  await execa2(
+    "pnpm",
+    [
+      "exec",
+      "opennextjs-cloudflare",
+      "preview",
+      "--config",
+      join5(".bigcommerce", "wrangler.jsonc")
+    ],
+    {
+      stdio: "inherit",
+      cwd: process.cwd()
+    }
+  );
 });
 
 // src/cli/commands/telemetry.ts
-import { Argument, Command as Command6, Option as Option5 } from "commander";
-import { colorize } from "consola/utils";
-var telemetryService = new Telemetry();
+import { Argument, Command as Command7, Option as Option7 } from "commander";
+import { colorize as colorize3 } from "consola/utils";
+var telemetryService = getTelemetry();
 var isEnabled = telemetryService.isEnabled();
-var telemetry3 = new Command6("telemetry").addArgument(new Argument("[arg]").choices(["disable", "enable", "status"])).addOption(new Option5("--enable", `Enables CLI telemetry collection.`).conflicts("disable")).option("--disable", `Disables CLI telemetry collection.`).action((arg, options) => {
+var telemetry2 = new Command7("telemetry").addArgument(new Argument("[arg]").choices(["disable", "enable", "status"])).addOption(new Option7("--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;
@@ -952,7 +1355,7 @@ var telemetry3 = new Command6("telemetry").addArgument(new Argument("[arg]").cho
     consola.info("Catalyst CLI Telemetry\n");
   }
   consola.info(
-    `Status: ${colorize("bold", isEnabled ? colorize("green", "Enabled") : colorize("red", "Disabled"))}`
+    `Status: ${colorize3("bold", isEnabled ? colorize3("green", "Enabled") : colorize3("red", "Disabled"))}`
   );
   if (!isEnabled) {
     consola.info(
@@ -962,8 +1365,8 @@ var telemetry3 = new Command6("telemetry").addArgument(new Argument("[arg]").cho
 });
 
 // src/cli/commands/version.ts
-import { Command as Command7 } from "commander";
-var version = new Command7("version").description("Display detailed version information.").action(() => {
+import { Command as Command8 } from "commander";
+var version = new Command8("version").description("Display detailed version information.").action(() => {
   consola.log("Version Information:");
   consola.log(`CLI Version: ${package_default.version}`);
   consola.log(`Node Version: ${process.version}`);
@@ -971,7 +1374,6 @@ var version = new Command7("version").description("Display detailed version info
 });
 
 // src/cli/hooks/telemetry.ts
-var telemetry4 = new Telemetry();
 var allowlistArguments = ["--keep-temp-dir", "--api-host", "--project-uuid"];
 function parseArguments(args) {
   return args.reduce((result, arg, index, array) => {
@@ -996,31 +1398,97 @@ function parseArguments(args) {
     return result;
   }, {});
 }
-var telemetryPreHook = async (command) => {
-  const [commandName, ...args] = command.args;
-  return await telemetry4.track(commandName, {
-    ...parseArguments(args)
+function getCommandPath(cmd) {
+  const parts = [];
+  let current = cmd;
+  while (current.parent) {
+    parts.unshift(current.name());
+    current = current.parent;
+  }
+  return parts.join(" ");
+}
+var telemetryPreHook = async (thisCommand, actionCommand) => {
+  const telemetry3 = getTelemetry();
+  const commandName = getCommandPath(actionCommand);
+  telemetry3.commandName = commandName;
+  return await telemetry3.track(commandName, {
+    ...parseArguments(thisCommand.args)
   });
 };
 var telemetryPostHook = async () => {
-  await telemetry4.analytics.closeAndFlush();
+  const telemetry3 = getTelemetry();
+  await telemetry3.track("command_completed", { durationMs: telemetry3.durationMs() });
+  await telemetry3.analytics.closeAndFlush();
 };
 
 // src/cli/program.ts
-var program = new Command8();
-config({
-  path: [
-    resolve(process.cwd(), ".env"),
-    resolve(process.cwd(), ".env.local"),
-    // Assumes the parent directory is the monorepo root:
-    resolve(process.cwd(), "..", ".env"),
-    resolve(process.cwd(), "..", ".env.local")
-  ]
-});
-consola.log(colorize2("cyanBright", `\u25E2 ${package_default.name} v${package_default.version}
+var program = new Command9();
+consola.log(colorize4("cyanBright", `\u25E2 ${package_default.name} v${package_default.version}
+`));
+program.name(package_default.name).version(package_default.version).description("CLI tool for Catalyst development").addOption(
+  new Option8(
+    "--env-path <path>",
+    "Path to environment file to load (relative to current working directory)"
+    // We are using argParser, because commander loads in environment variables before executing hooks.
+  ).argParser((value) => {
+    if (value) {
+      const envFilePath = resolve(process.cwd(), value);
+      const result = config({
+        path: envFilePath,
+        override: true
+      });
+      if (result.error) {
+        const errCode = "code" in result.error && typeof result.error.code === "string" ? result.error.code : void 0;
+        const message = errCode === "ENOENT" ? `Env file not found: ${envFilePath}` : `Failed to load --env-path ${value}: ${result.error.message}`;
+        throw new Error(message);
+      }
+      consola.log(colorize4("cyanBright", `Loaded environment variables from ${envFilePath}
 `));
-program.name(package_default.name).version(package_default.version).description("CLI tool for Catalyst development").addCommand(version).addCommand(dev).addCommand(start).addCommand(build).addCommand(deploy).addCommand(project).addCommand(telemetry3).hook("preAction", telemetryPreHook).hook("postAction", telemetryPostHook);
+    }
+    return value;
+  })
+).addCommand(version).addCommand(start).addCommand(build).addCommand(deploy).addCommand(logs).addCommand(project).addCommand(auth).addCommand(telemetry2).hook("preAction", telemetryPreHook).hook("postAction", telemetryPostHook);
 
 // src/cli/index.ts
-program.parse(process.argv);
+var handleFatalError = async (error) => {
+  const telemetry3 = getTelemetry();
+  const errorMessage = error instanceof Error ? error.message : String(error);
+  const errorStack = error instanceof Error ? error.stack : void 0;
+  try {
+    await telemetry3.track("error", {
+      commandName: telemetry3.commandName,
+      errorMessage,
+      errorStack,
+      durationMs: telemetry3.durationMs()
+    });
+    await telemetry3.analytics.closeAndFlush();
+  } catch {
+  }
+  consola.error(errorMessage);
+  if (telemetry3.isEnabled()) {
+    consola.info(
+      `
+Trace ID: ${telemetry3.sessionId}
+Share this Trace ID with BigCommerce support.`
+    );
+  } else {
+    consola.info(
+      "\nEnable telemetry (`catalyst telemetry enable`) for improved troubleshooting with BigCommerce support."
+    );
+  }
+  process.exit(1);
+};
+process.on("uncaughtException", (error) => {
+  void handleFatalError(error);
+});
+process.on("unhandledRejection", (reason) => {
+  void handleFatalError(reason);
+});
+void (async () => {
+  try {
+    await program.parseAsync(process.argv);
+  } catch (error) {
+    await handleFatalError(error);
+  }
+})();
 //# sourceMappingURL=cli.js.map