wrangler 3.105.0 → 3.106.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.105.0",
+  "version": "3.106.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -55,15 +55,15 @@
     "blake3-wasm": "2.1.5",
     "esbuild": "0.17.19",
     "path-to-regexp": "6.3.0",
-    "unenv": "2.0.0-rc.0",
-    "workerd": "1.20241230.0",
+    "unenv": "2.0.0-rc.1",
+    "workerd": "1.20250124.0",
     "@cloudflare/kv-asset-handler": "0.3.4",
-    "miniflare": "3.20241230.2"
+    "miniflare": "3.20250124.0"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
     "@cloudflare/types": "6.18.4",
-    "@cloudflare/workers-types": "^4.20241230.0",
+    "@cloudflare/workers-types": "^4.20250121.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.47.0",
@@ -137,14 +137,14 @@
     "xdg-app-paths": "^8.3.0",
     "xxhash-wasm": "^1.0.1",
     "yargs": "^17.7.2",
-    "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "^0.13.2",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/workers-shared": "0.12.3",
+    "@cloudflare/pages-shared": "^0.13.3",
+    "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/workers-shared": "0.12.5",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20241230.0"
+    "@cloudflare/workers-types": "^4.20250121.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {

package/wrangler-dist/cli.js

@@ -98108,7 +98108,7 @@ var import_undici3 = __toESM(require_undici());
 
 // package.json
 var name = "wrangler";
-var version = "3.105.0";
+var version = "3.106.0";
 
 // src/environment-variables/misc-variables.ts
 init_import_meta_url();
@@ -98229,22 +98229,24 @@ var getRegistryPath = getEnvironmentVariableFactory({
 // src/errors.ts
 init_import_meta_url();
 var UserError = class extends Error {
-  constructor(...args) {
-    super(...args);
+  telemetryMessage;
+  constructor(message, options30) {
+    super(message, options30);
     Object.setPrototypeOf(this, new.target.prototype);
+    this.telemetryMessage = options30?.telemetryMessage === true ? message : options30?.telemetryMessage;
   }
 };
 __name(UserError, "UserError");
 var DeprecationError = class extends UserError {
-  constructor(message) {
+  constructor(message, options30) {
     super(`Deprecation:
-${message}`);
+${message}`, options30);
   }
 };
 __name(DeprecationError, "DeprecationError");
 var FatalError = class extends UserError {
-  constructor(message, code) {
-    super(message);
+  constructor(message, code, options30) {
+    super(message, options30);
     this.code = code;
   }
 };
@@ -98253,23 +98255,29 @@ var CommandLineArgsError = class extends UserError {
 };
 __name(CommandLineArgsError, "CommandLineArgsError");
 var JsonFriendlyFatalError = class extends FatalError {
-  constructor(message, code) {
-    super(message);
+  constructor(message, code, options30) {
+    super(message, code, options30);
     this.code = code;
   }
 };
 __name(JsonFriendlyFatalError, "JsonFriendlyFatalError");
 var MissingConfigError = class extends Error {
+  telemetryMessage;
   constructor(key) {
     super(`Missing config value for ${key}`);
+    this.telemetryMessage = `Missing config value for ${key}`;
   }
 };
 __name(MissingConfigError, "MissingConfigError");
-function createFatalError(message, isJson, code) {
+function createFatalError(message, isJson, code, telemetryMessage) {
   if (isJson) {
-    return new JsonFriendlyFatalError(JSON.stringify(message), code);
+    return new JsonFriendlyFatalError(
+      JSON.stringify(message),
+      code,
+      telemetryMessage
+    );
   } else {
-    return new FatalError(`${message}`, code);
+    return new FatalError(`${message}`, code, telemetryMessage);
   }
 }
 __name(createFatalError, "createFatalError");
@@ -99959,8 +99967,8 @@ var ParseError = class extends UserError {
   notes;
   location;
   kind;
-  constructor({ text, notes, location, kind }) {
-    super(text);
+  constructor({ text, notes, location, kind, telemetryMessage }) {
+    super(text, { telemetryMessage });
     this.name = this.constructor.name;
     this.text = text;
     this.notes = notes ?? [];
@@ -100017,43 +100025,37 @@ function parseTOML(input, file) {
       file,
       fileText: input
     };
-    throw new ParseError({ text, location });
+    throw new ParseError({
+      text,
+      location,
+      telemetryMessage: "TOML parse error"
+    });
   }
 }
 __name(parseTOML, "parseTOML");
-var JSON_ERROR_SUFFIX = " in JSON at position ";
 function parsePackageJSON(input, file) {
   return parseJSON(input, file);
 }
 __name(parsePackageJSON, "parsePackageJSON");
 function parseJSON(input, file) {
-  try {
-    return JSON.parse(input);
-  } catch (err) {
-    const { message } = err;
-    const index = message.lastIndexOf(JSON_ERROR_SUFFIX);
-    if (index < 0) {
-      throw err;
-    }
-    const text = message.substring(0, index);
-    const position = parseInt(
-      message.substring(index + JSON_ERROR_SUFFIX.length)
-    );
-    const location = indexLocation({ file, fileText: input }, position);
-    throw new ParseError({ text, location });
-  }
+  return parseJSONC(input, file, {
+    allowEmptyContent: false,
+    allowTrailingComma: false,
+    disallowComments: true
+  });
 }
 __name(parseJSON, "parseJSON");
-function parseJSONC(input, file) {
+function parseJSONC(input, file, options30 = { allowTrailingComma: true }) {
   const errors = [];
-  const data = parse2(input, errors, { allowTrailingComma: true });
+  const data = parse2(input, errors, options30);
   if (errors.length) {
     throw new ParseError({
       text: printParseErrorCode(errors[0].error),
       location: {
         ...indexLocation({ file, fileText: input }, errors[0].offset + 1),
         length: errors[0].length
-      }
+      },
+      telemetryMessage: "JSON(C) parse error"
     });
   }
   return data;
@@ -100086,7 +100088,8 @@ function readFileSync5(file) {
         {
           text: message.replace(file, (0, import_node_path4.resolve)(file))
         }
-      ]
+      ],
+      telemetryMessage: "Could not read file"
     });
   }
 }
@@ -100773,10 +100776,7 @@ function findRedirectedWranglerConfig(cwd2, userConfigPath) {
   let redirectedConfigPath;
   const deployConfigFile = readFileSync5(deployConfigPath);
   try {
-    const deployConfig = parseJSONC(
-      deployConfigFile,
-      deployConfigPath
-    );
+    const deployConfig = parseJSONC(deployConfigFile, deployConfigPath);
     redirectedConfigPath = deployConfig.configPath && import_node_path7.default.resolve(import_node_path7.default.dirname(deployConfigPath), deployConfig.configPath);
   } catch (e7) {
     throw new UserError(
@@ -106852,7 +106852,9 @@ init_import_meta_url();
 var import_prompts = __toESM(require_prompts3());
 var NoDefaultValueProvided = class extends UserError {
   constructor() {
-    super("This command cannot be run in a non-interactive context");
+    super("This command cannot be run in a non-interactive context", {
+      telemetryMessage: true
+    });
     Object.setPrototypeOf(this, new.target.prototype);
   }
 };
@@ -117455,7 +117457,7 @@ async function deleteCORSPolicy(accountId, bucketName, jurisdiction) {
 }
 __name(deleteCORSPolicy, "deleteCORSPolicy");
 function isValidR2BucketName(name2) {
-  return typeof name2 === "string" && /^[a-zA-Z][a-zA-Z0-9-]*$/.test(name2);
+  return typeof name2 === "string" && /^[a-z0-9][a-z0-9-]{1,61}[a-z0-9]$/.test(name2);
 }
 __name(isValidR2BucketName, "isValidR2BucketName");
 var CHUNK_SIZE = 1024;
@@ -118791,7 +118793,7 @@ init_import_meta_url();
 var import_node_buffer2 = require("node:buffer");
 var import_node_zlib = require("node:zlib");
 var ONE_KIB_BYTES = 1024;
-var ALLOWED_INITIAL_MAX = ONE_KIB_BYTES * 1024;
+var MAX_GZIP_SIZE_BYTES = 3 * ONE_KIB_BYTES * ONE_KIB_BYTES;
 async function getSize(modules) {
   const gzipSize = (0, import_node_zlib.gzipSync)(
     await new import_node_buffer2.Blob(modules.map((file) => file.content)).arrayBuffer()
@@ -118803,7 +118805,7 @@ __name(getSize, "getSize");
 async function printBundleSize(main2, modules) {
   const { size, gzipSize } = await getSize([...modules, main2]);
   const bundleReport = `${(size / ONE_KIB_BYTES).toFixed(2)} KiB / gzip: ${(gzipSize / ONE_KIB_BYTES).toFixed(2)} KiB`;
-  const percentage = gzipSize / ALLOWED_INITIAL_MAX * 100;
+  const percentage = gzipSize / MAX_GZIP_SIZE_BYTES * 100;
   const colorizedReport = percentage > 90 ? source_default.red(bundleReport) : percentage > 70 ? source_default.yellow(bundleReport) : source_default.green(bundleReport);
   logger.log(`Total Upload: ${colorizedReport}`);
 }
@@ -120867,7 +120869,11 @@ async function retryOnAPIFailure(action, backoff = 0, attempts = MAX_ATTEMPTS) {
   try {
     return await action();
   } catch (err) {
-    if (err instanceof APIError && !err.isRetryable() || !(err instanceof TypeError)) {
+    if (err instanceof APIError) {
+      if (!err.isRetryable()) {
+        throw err;
+      }
+    } else if (!(err instanceof TypeError)) {
       throw err;
     }
     logger.info(source_default.dim(`Retrying API call after error...`));
@@ -122854,7 +122860,8 @@ var syncAssets = /* @__PURE__ */ __name(async (accountId, assetDirectory, script
     if (!initializeAssetsResponse.jwt) {
       throw new FatalError(
         "Could not find assets information to attach to deployment. Please try again.",
-        1
+        1,
+        { telemetryMessage: true }
       );
     }
     logger.info(`No files to upload. Proceeding with deployment...`);
@@ -122874,7 +122881,10 @@ var syncAssets = /* @__PURE__ */ __name(async (accountId, assetDirectory, script
       if (manifestEntry === void 0) {
         throw new FatalError(
           `A file was requested that does not appear to exist.`,
-          1
+          1,
+          {
+            telemetryMessage: "A file was requested that does not appear to exist. (asset manifest upload)"
+          }
         );
       }
       assetLogCount = logAssetUpload(`+ ${manifestEntry[0]}`, assetLogCount);
@@ -122945,7 +122955,9 @@ var syncAssets = /* @__PURE__ */ __name(async (accountId, assetDirectory, script
           throw new FatalError(
             `Upload took too long.
 Asset upload took too long on bucket ${bucketIndex + 1}/${initializeAssetsResponse.buckets.length}. Please try again.
-Assets already uploaded have been saved, so the next attempt will automatically resume from this point.`
+Assets already uploaded have been saved, so the next attempt will automatically resume from this point.`,
+            void 0,
+            { telemetryMessage: "Asset upload took too long" }
           );
         } else {
           throw e7;
@@ -122966,7 +122978,8 @@ Assets already uploaded have been saved, so the next attempt will automatically
   if (!completionJwt) {
     throw new FatalError(
       "Failed to complete asset upload. Please try again.",
-      1
+      1,
+      { telemetryMessage: true }
     );
   }
   const uploadMs = Date.now() - start;
@@ -122999,7 +123012,8 @@ var buildAssetManifest = /* @__PURE__ */ __name(async (dir) => {
           throw new UserError(
             `Maximum number of assets exceeded.
 Cloudflare Workers supports up to ${MAX_ASSET_COUNT2.toLocaleString()} assets in a version. We found ${counter.toLocaleString()} files in the specified assets directory "${dir}".
-Ensure your assets directory contains a maximum of ${MAX_ASSET_COUNT2.toLocaleString()} files, and that you have specified your assets directory correctly.`
+Ensure your assets directory contains a maximum of ${MAX_ASSET_COUNT2.toLocaleString()} files, and that you have specified your assets directory correctly.`,
+            { telemetryMessage: "Maximum number of assets exceeded" }
           );
         }
         if (filestat.size > MAX_ASSET_SIZE2) {
@@ -123016,7 +123030,8 @@ Cloudflare Workers supports assets with sizes of up to ${prettyBytes(
                 binary: true
               }
             )}.
-Ensure all assets in your assets directory "${dir}" conform with the Workers maximum size requirement.`
+Ensure all assets in your assets directory "${dir}" conform with the Workers maximum size requirement.`,
+            { telemetryMessage: "Asset too large" }
           );
         }
         manifest[normalizeFilePath(relativeFilepath)] = {
@@ -123055,11 +123070,14 @@ function getAssetsOptions(args, config) {
   const { directory, binding } = assets;
   if (directory === void 0) {
     throw new UserError(
-      "The `assets` property in your configuration is missing the required `directory` property."
+      "The `assets` property in your configuration is missing the required `directory` property.",
+      { telemetryMessage: true }
     );
   }
   if (directory === "") {
-    throw new UserError("`The assets directory cannot be an empty string.");
+    throw new UserError("`The assets directory cannot be an empty string.", {
+      telemetryMessage: true
+    });
   }
   const assetsBasePath = getAssetsBasePath(config, args.assets);
   const resolvedAssetsPath = path32.resolve(assetsBasePath, directory);
@@ -123067,7 +123085,10 @@ function getAssetsOptions(args, config) {
     const sourceOfTruthMessage = args.assets ? '"--assets" command line argument' : '"assets.directory" field in your configuration file';
     throw new UserError(
       `The directory specified by the ${sourceOfTruthMessage} does not exist:
-${resolvedAssetsPath}`
+${resolvedAssetsPath}`,
+      {
+        telemetryMessage: `The assets directory specified does not exist`
+      }
     );
   }
   const routingConfig = {
@@ -123090,7 +123111,10 @@ __name(getAssetsOptions, "getAssetsOptions");
 function validateAssetsArgsAndConfig(args, config) {
   if ("legacy" in args ? args.assets && args.legacy.legacyAssets : (args.assets || config?.assets) && (args?.legacyAssets || config?.legacy_assets)) {
     throw new UserError(
-      "Cannot use assets and legacy assets in the same Worker.\nPlease remove either the `legacy_assets` or `assets` field from your configuration file."
+      "Cannot use assets and legacy assets in the same Worker.\nPlease remove either the `legacy_assets` or `assets` field from your configuration file.",
+      {
+        telemetryMessage: "Cannot use assets and legacy assets in the same Worker"
+      }
     );
   }
   if ("legacy" in args ? args.assets && args.legacy.site : (args.assets || config?.assets) && (args.site || config?.site)) {
@@ -123104,7 +123128,8 @@ function validateAssetsArgsAndConfig(args, config) {
   );
   if ("legacy" in args ? args.entrypoint === noOpEntrypoint && args.assets?.binding : !(args.script || config?.main) && config?.assets?.binding) {
     throw new UserError(
-      "Cannot use assets with a binding in an assets-only Worker.\nPlease remove the asset binding from your configuration file, or provide a Worker script in your configuration file (`main`)."
+      "Cannot use assets with a binding in an assets-only Worker.\nPlease remove the asset binding from your configuration file, or provide a Worker script in your configuration file (`main`).",
+      { telemetryMessage: true }
     );
   }
   if (config?.placement?.mode === "smart" && config?.assets?.experimental_serve_directly === false) {
@@ -123119,7 +123144,8 @@ function validateAssetsArgsAndConfig(args, config) {
   }
   if ("legacy" in args ? args.entrypoint === noOpEntrypoint && args.assets?.assetConfig?.serve_directly === false : !config?.main && config?.assets?.experimental_serve_directly === false) {
     throw new UserError(
-      "Cannot set experimental_serve_directly=false without a Worker script.\nPlease remove experimental_serve_directly from your configuration file, or provide a Worker script in your configuration file (`main`)."
+      "Cannot set experimental_serve_directly=false without a Worker script.\nPlease remove experimental_serve_directly from your configuration file, or provide a Worker script in your configuration file (`main`).",
+      { telemetryMessage: true }
     );
   }
 }
@@ -123139,12 +123165,15 @@ function errorOnLegacyPagesWorkerJSAsset(file, hasAssetsIgnoreFile) {
   if (!hasAssetsIgnoreFile) {
     const workerJsType = file === "_worker.js" ? "file" : file.startsWith("_worker.js") ? "directory" : null;
     if (workerJsType !== null) {
-      throw new UserError(dedent2`
+      throw new UserError(
+        dedent2`
 			Uploading a Pages _worker.js ${workerJsType} as an asset.
 			This could expose your private server-side code to the public Internet. Is this intended?
 			If you do not want to upload this ${workerJsType}, either remove it or add an "${CF_ASSETS_IGNORE_FILENAME}" file, to the root of your asset directory, containing "_worker.js" to avoid uploading.
 			If you do want to upload this ${workerJsType}, you can add an empty "${CF_ASSETS_IGNORE_FILENAME}" file, to the root of your asset directory, to hide this error.
-		`);
+		`,
+        { telemetryMessage: true }
+      );
     }
   }
 }
@@ -124339,7 +124368,7 @@ function getBindings2(configParam, env7, local, args) {
   );
   const hyperdriveBindings = configParam.hyperdrive.map((hyperdrive2) => {
     const connectionStringFromEnv = process.env[`WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_${hyperdrive2.binding}`];
-    if (!connectionStringFromEnv && !hyperdrive2.localConnectionString) {
+    if (local && connectionStringFromEnv === void 0 && hyperdrive2.localConnectionString === void 0) {
       throw new UserError(
         `When developing locally, you should use a local Postgres connection string to emulate Hyperdrive functionality. Please setup Postgres locally and set the value of the 'WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_${hyperdrive2.binding}' variable or "${hyperdrive2.binding}"'s "localConnectionString" to the Postgres connection string.`
       );
@@ -140243,7 +140272,9 @@ var Handler6 = /* @__PURE__ */ __name(async (args) => {
   if (file && command2) {
     throw createFatalError(
       `Error: can't provide both --command and --file.`,
-      json
+      json,
+      void 0,
+      { telemetryMessage: true }
     );
   }
   const isInteractive3 = process.stdout.isTTY;
@@ -141857,7 +141888,8 @@ async function deleteHandler(args) {
   const config = readConfig(args);
   if (config.pages_build_output_dir) {
     throw new UserError(
-      "It looks like you've run a Workers-specific command in a Pages project.\nFor Pages, please run `wrangler pages project delete` instead."
+      "It looks like you've run a Workers-specific command in a Pages project.\nFor Pages, please run `wrangler pages project delete` instead.",
+      { telemetryMessage: true }
     );
   }
   sendMetricsEvent(
@@ -141869,7 +141901,10 @@ async function deleteHandler(args) {
   const scriptName = getScriptName(args, config);
   if (!scriptName) {
     throw new UserError(
-      `A worker name must be defined, either via --name, or in your ${configFileName(config.configPath)} file`
+      `A worker name must be defined, either via --name, or in your ${configFileName(config.configPath)} file`,
+      {
+        telemetryMessage: "`A worker name must be defined, either via --name, or in your config file"
+      }
     );
   }
   if (args.dryRun) {
@@ -142203,7 +142238,7 @@ function deployOptions(yargs) {
   }).option("experimental-auto-create", {
     describe: "Automatically provision draft bindings with new resources",
     type: "boolean",
-    default: false,
+    default: true,
     hidden: true,
     alias: "x-auto-create"
   });
@@ -146627,6 +146662,12 @@ function prettyPrintLogs(data) {
     logger.log(
       `Queue ${queueName} (${batchSizeMsg}) - ${outcome} @ ${datetime}`
     );
+  } else if (isRpcEvent(eventMessage2.event)) {
+    const outcome = prettifyOutcome(eventMessage2.outcome);
+    const datetime = new Date(eventMessage2.eventTimestamp).toLocaleString();
+    logger.log(
+      `${eventMessage2.entrypoint}.${eventMessage2.event.rpcMethod} - ${outcome} @ ${datetime}`
+    );
   } else {
     const outcome = prettifyOutcome(eventMessage2.outcome);
     const datetime = new Date(eventMessage2.eventTimestamp).toLocaleString();
@@ -146664,6 +146705,10 @@ function isQueueEvent(event) {
   return Boolean(event && "queue" in event);
 }
 __name(isQueueEvent, "isQueueEvent");
+function isRpcEvent(event) {
+  return Boolean(event && "rpcMethod" in event);
+}
+__name(isRpcEvent, "isRpcEvent");
 function isAlarmEvent(event) {
   return Boolean(event && "scheduledTime" in event && !("cron" in event));
 }
@@ -152879,11 +152924,21 @@ async function authorizeR2Bucket(pipelineName, accountId, bucketName) {
   });
   !__testSkipDelaysFlag && await retryOnAPIFailure(
     async () => {
-      await r22.send(
-        new HeadBucketCommand({
-          Bucket: bucketName
-        })
-      );
+      try {
+        await r22.send(
+          new HeadBucketCommand({
+            Bucket: bucketName
+          })
+        );
+      } catch (err) {
+        if (err instanceof Error && err.name === "401") {
+          throw new AuthAPIError({
+            status: 401,
+            text: "R2 HeadBucket request failed with status: 401"
+          });
+        }
+        throw err;
+      }
     },
     1e3,
     10
@@ -152891,6 +152946,12 @@ async function authorizeR2Bucket(pipelineName, accountId, bucketName) {
   return serviceToken;
 }
 __name(authorizeR2Bucket, "authorizeR2Bucket");
+var AuthAPIError = class extends APIError {
+  isRetryable() {
+    return true;
+  }
+};
+__name(AuthAPIError, "AuthAPIError");
 function getAccountR2Endpoint(accountId) {
   return `https://${accountId}.r2.cloudflarestorage.com`;
 }
@@ -154432,7 +154493,7 @@ var r2BucketCreateCommand = createCommand({
     const { name: name2, location, storageClass, jurisdiction } = args;
     if (!isValidR2BucketName(name2)) {
       throw new UserError(
-        `The bucket name "${name2}" is invalid. Bucket names can only have alphanumeric and - characters.`
+        `The bucket name "${name2}" is invalid. Bucket names must begin and end with an alphanumeric and can only contain letters (a-z), numbers (0-9), and hyphens (-).`
       );
     }
     if (jurisdiction && location) {
@@ -154691,10 +154752,7 @@ var r2BucketCORSSetCommand = createCommand({
   async handler({ bucket, file, jurisdiction, force }, { config }) {
     const accountId = await requireAuth(config);
     const jsonFilePath = import_node_path65.default.resolve(file);
-    const corsConfig = parseJSON(
-      readFileSync5(jsonFilePath),
-      jsonFilePath
-    );
+    const corsConfig = parseJSON(readFileSync5(jsonFilePath), jsonFilePath);
     if (!corsConfig.rules || !Array.isArray(corsConfig.rules)) {
       throw new UserError(
         `The CORS configuration file must contain a 'rules' array as expected by the request body of the CORS API: https://developers.cloudflare.com/api/operations/r2-put-bucket-cors-policy`
@@ -165651,7 +165709,8 @@ var tailCommand = createCommand({
           throw createFatalError(
             "Tail disconnected, exiting.",
             args.format === "json",
-            1
+            1,
+            { telemetryMessage: true }
           );
         }
         waitingForPong = true;
@@ -170888,7 +170947,9 @@ if (proxy) {
 function createCLIParser(argv) {
   const wrangler = yargs_default(argv).strict().showHelpOnFail(false).fail((msg, error2) => {
     if (!error2 || error2.name === "YError") {
-      error2 = new CommandLineArgsError(msg);
+      error2 = new CommandLineArgsError(msg, {
+        telemetryMessage: "yargs validation error"
+      });
     }
     throw error2;
   }).scriptName("wrangler").wrap(null).locale("en_US").version(false).option("v", {
@@ -170907,7 +170968,7 @@ function createCLIParser(argv) {
     )
   ).option("env", {
     alias: "e",
-    describe: "Environment to use for operations and .env files",
+    describe: "Environment to use for operations, and for selecting .env and .dev.vars files",
     type: "string",
     requiresArg: true
   }).check(demandSingleValue("env")).option("experimental-json-config", {
@@ -170920,7 +170981,8 @@ function createCLIParser(argv) {
   }).check((args) => {
     if (args["experimental-json-config"] === false) {
       throw new CommandLineArgsError(
-        `Wrangler now supports wrangler.json configuration files by default and ignores the value of the \`--experimental-json-config\` flag.`
+        `Wrangler now supports wrangler.json configuration files by default and ignores the value of the \`--experimental-json-config\` flag.`,
+        { telemetryMessage: true }
       );
     }
     return true;
@@ -171649,7 +171711,8 @@ ${tryRunningItIn}${oneOfThese}`
         durationMs,
         durationSeconds: durationMs / 1e3,
         durationMinutes: durationMs / 1e3 / 60,
-        errorType: errorType ?? (e7 instanceof Error ? e7.constructor.name : void 0)
+        errorType: errorType ?? (e7 instanceof Error ? e7.constructor.name : void 0),
+        errorMessage: e7 instanceof UserError ? e7.telemetryMessage : void 0
       },
       argv
     );