wrangler 4.40.3 → 4.42.0

package/wrangler-dist/cli.js

@@ -27379,7 +27379,7 @@ async function prepareContainerImagesForDev(args) {
       if (!isCloudflareRegistryLink(options.image_uri)) {
         throw new UserError(
           `Image "${options.image_uri}" is a registry link but does not point to the Cloudflare container registry.
-To use an existing image from another repository, see https://developers.cloudflare.com/containers/image-management/#using-existing-images`
+To use an existing image from another repository, see https://developers.cloudflare.com/containers/platform-details/image-management/#using-pre-built-container-images`
         );
       }
       const pull = await pullImage(dockerPath, options);
@@ -27414,6 +27414,19 @@ function resolveImageName(accountId, image) {
   if (url4.pathname.startsWith(`/${accountId}`)) {
     return image;
   }
+  const accountIdPattern = /^\/([a-f0-9]{32})\//;
+  const match2 = accountIdPattern.exec(url4.pathname);
+  if (match2) {
+    const foundAccountId = match2[1];
+    if (foundAccountId !== accountId) {
+      throw new Error(
+        `Image "${image}" does not belong to your account
+Image appears to belong to account: "${foundAccountId}"
+Current account: "${accountId}"`
+      );
+    }
+    return image;
+  }
   return `${url4.hostname}/${accountId}${url4.pathname}`;
 }
 var init_images = __esm({
@@ -33628,7 +33641,7 @@ function getComplianceRegionSubdomain(complianceConfig) {
 function getStagingSubdomain() {
   return getCloudflareApiEnvironmentFromEnv() === "staging" ? ".staging" : "";
 }
-var import_node_path2, getC3CommandFromEnv, getWranglerSendMetricsFromEnv, getCloudflareApiEnvironmentFromEnv, COMPLIANCE_REGION_CONFIG_PUBLIC, COMPLIANCE_REGION_CONFIG_UNKNOWN, getCloudflareComplianceRegionFromEnv, getCloudflareComplianceRegion, getCloudflareApiBaseUrlFromEnv, getCloudflareApiBaseUrl, getSanitizeLogs, getOutputFileDirectoryFromEnv, getOutputFilePathFromEnv, getCIMatchTag, getCIOverrideName, getCIOverrideNetworkModeHost, getCIGeneratePreviewAlias, getWorkersCIBranchName, getBuildConditionsFromEnv, getBuildPlatformFromEnv, getRegistryPath, getD1ExtraLocationChoices, getDockerPath, getCloudflareLoadDevVarsFromDotEnv, getCloudflareIncludeProcessEnvFromEnv, getTraceHeader, getDisableConfigWatching;
+var import_node_path2, getC3CommandFromEnv, getWranglerSendMetricsFromEnv, getWranglerSendErrorReportsFromEnv, getCloudflareApiEnvironmentFromEnv, COMPLIANCE_REGION_CONFIG_PUBLIC, COMPLIANCE_REGION_CONFIG_UNKNOWN, getCloudflareComplianceRegionFromEnv, getCloudflareComplianceRegion, getCloudflareApiBaseUrlFromEnv, getCloudflareApiBaseUrl, getSanitizeLogs, getOutputFileDirectoryFromEnv, getOutputFilePathFromEnv, getCIMatchTag, getCIOverrideName, getCIOverrideNetworkModeHost, getCIGeneratePreviewAlias, getWorkersCIBranchName, getBuildConditionsFromEnv, getBuildPlatformFromEnv, getRegistryPath, getD1ExtraLocationChoices, getDockerPath, getSubdomainMixedStateCheckDisabled, getCloudflareLoadDevVarsFromDotEnv, getCloudflareIncludeProcessEnvFromEnv, getTraceHeader, getDisableConfigWatching;
 var init_misc_variables = __esm({
   "src/environment-variables/misc-variables.ts"() {
     init_import_meta_url();
@@ -33644,6 +33657,9 @@ var init_misc_variables = __esm({
     getWranglerSendMetricsFromEnv = getBooleanEnvironmentVariableFactory({
       variableName: "WRANGLER_SEND_METRICS"
     });
+    getWranglerSendErrorReportsFromEnv = getBooleanEnvironmentVariableFactory({
+      variableName: "WRANGLER_SEND_ERROR_REPORTS"
+    });
     getCloudflareApiEnvironmentFromEnv = getEnvironmentVariableFactory(
       {
         variableName: "WRANGLER_API_ENVIRONMENT",
@@ -33727,6 +33743,10 @@ var init_misc_variables = __esm({
         return "docker";
       }
     });
+    getSubdomainMixedStateCheckDisabled = getBooleanEnvironmentVariableFactory({
+      variableName: "WRANGLER_DISABLE_SUBDOMAIN_MIXED_STATE_CHECK",
+      defaultValue: false
+    });
     getCloudflareLoadDevVarsFromDotEnv = getBooleanEnvironmentVariableFactory({
       variableName: "CLOUDFLARE_LOAD_DEV_VARS_FROM_DOT_ENV",
       defaultValue: true
@@ -34117,6 +34137,7 @@ var init_logger = __esm({
     import_esbuild = require("esbuild");
     init_factory();
     init_misc_variables();
+    init_parse();
     init_log_file();
     LOGGER_LEVELS = {
       none: -1,
@@ -34175,7 +34196,13 @@ var init_logger = __esm({
       info = /* @__PURE__ */ __name((...args) => this.doLog("info", args), "info");
       log = /* @__PURE__ */ __name((...args) => this.doLog("log", args), "log");
       warn = /* @__PURE__ */ __name((...args) => this.doLog("warn", args), "warn");
-      error = /* @__PURE__ */ __name((...args) => this.doLog("error", args), "error");
+      error(...args) {
+        if (args.length === 1 && args[0] instanceof ParseError) {
+          this.doLog("error", formatMessage(args[0]));
+        } else {
+          this.doLog("error", args);
+        }
+      }
       table(data, options) {
         const derivedHead = data.length === 0 ? [] : Object.keys(data[0]);
         const wordWrap = options?.wordWrap ?? false;
@@ -34221,7 +34248,7 @@ var init_logger = __esm({
         }
       }
       doLog(messageLevel, args) {
-        const message = this.formatMessage(messageLevel, (0, import_node_util.format)(...args));
+        const message = Array.isArray(args) ? this.formatMessage(messageLevel, (0, import_node_util.format)(...args)) : args;
         const inUnitTests = typeof vitest !== "undefined";
         if (!inUnitTests) {
           void appendToDebugLogFile(messageLevel, message);
@@ -93871,7 +93898,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.40.3";
+    version = "4.42.0";
   }
 });
 
@@ -100531,7 +100558,13 @@ var init_check_macos_version = __esm({
 });
 
 // ../cli/index.ts
-var import_process, shapes, status, space, logRaw, log, newline, format6, updateStatus, startSection, endSection, cancel, warn, success, stripAnsi3, linkRegex, crash, error;
+function setLogLevel(level) {
+  currentLogLevel = level;
+}
+function getLogLevel() {
+  return currentLogLevel;
+}
+var import_process, shapes, status, space, LOGGER_LEVELS2, currentLogLevel, logRaw, log, newline, format6, updateStatus, startSection, endSection, cancel, warn, success, stripAnsi3, linkRegex, crash, error;
 var init_cli = __esm({
   "../cli/index.ts"() {
     init_import_meta_url();
@@ -100570,9 +100603,23 @@ var init_cli = __esm({
     space = /* @__PURE__ */ __name((n7 = 1) => {
       return hidden("\u200A".repeat(n7));
     }, "space");
+    LOGGER_LEVELS2 = {
+      none: -1,
+      error: 0,
+      warn: 1,
+      info: 2,
+      log: 3,
+      debug: 4
+    };
+    currentLogLevel = "log";
+    __name(setLogLevel, "setLogLevel");
+    __name(getLogLevel, "getLogLevel");
     logRaw = /* @__PURE__ */ __name((msg) => {
-      stdout.write(`${msg}
+      const currentLevel = getLogLevel();
+      if (LOGGER_LEVELS2[currentLevel] >= LOGGER_LEVELS2.log) {
+        stdout.write(`${msg}
 `);
+      }
     }, "logRaw");
     log = /* @__PURE__ */ __name((msg) => {
       const lines = msg.split("\n").map((ln) => `${gray(shapes.bar)}${ln.length > 0 ? " " + white(ln) : ""}`);
@@ -100691,7 +100738,8 @@ var init_cli = __esm({
       (0, import_process.exit)(1);
     }, "crash");
     error = /* @__PURE__ */ __name((msg, extra, corner = shapes.corners.bl) => {
-      if (msg) {
+      const currentLevel = getLogLevel();
+      if (msg && LOGGER_LEVELS2[currentLevel] >= LOGGER_LEVELS2.error) {
         stderr.write(
           `${gray(corner)} ${status.error} ${dim(msg)}
 ${extra ? space() + extra + "\n" : ""}`
@@ -106289,8 +106337,18 @@ function validateContainerApp(envName, topLevelName, configPath) {
           "instance_type",
           containerAppOptional.instance_type,
           "string",
-          ["dev", "basic", "standard"]
+          ALLOWED_INSTANCE_TYPES
         );
+        if (containerAppOptional.instance_type === "dev") {
+          diagnostics.warnings.push(
+            `The "dev" instance_type has been renamed to "lite" and will be removed in a subsequent version. Please update your configuration to use "lite" instead.`
+          );
+        }
+        if (containerAppOptional.instance_type === "standard") {
+          diagnostics.warnings.push(
+            `The "standard" instance_type has been renamed to "standard-1" and will be removed in a subsequent version. Please update your configuration to use "standard-1" instead.`
+          );
+        }
       } else if (validateOptionalProperty(
         diagnostics,
         field,
@@ -106464,7 +106522,7 @@ function isRemoteValid(targetObject, fieldPath, diagnostics) {
   }
   return true;
 }
-var import_node_assert, import_node_path9, ENGLISH, isRoute, isRouteArray, validateTailConsumers, validateAndNormalizeRules, validateTriggers, validateRules, validateRule, validateDefines, validateVars, validateBindingsProperty, validateUnsafeSettings, validateDurableObjectBinding, validateWorkflowBinding, validateCflogfwdrObject, validateCflogfwdrBinding, validateAssetsConfig, validateNamedSimpleBinding, validateAIBinding, validateVersionMetadataBinding, validateUnsafeBinding, validateBindingArray, validateCloudchamberConfig, validateKVBinding, validateSendEmailBinding, validateQueueBinding, validateR2Binding, validateD1Binding, validateVectorizeBinding, validateHyperdriveBinding, validateVpcServiceBinding, validateBindingsHaveUniqueNames, validateServiceBinding, validateAnalyticsEngineBinding, validateWorkerNamespaceBinding, validateMTlsCertificateBinding, validateConsumer, validateCompatibilityDate, validatePipelineBinding, validateSecretsStoreSecretBinding, validateHelloWorldBinding, validateWorkerLoaderBinding, validateRateLimitBinding, validateMigrations, validateObservability;
+var import_node_assert, import_node_path9, ENGLISH, ALLOWED_INSTANCE_TYPES, isRoute, isRouteArray, validateTailConsumers, validateAndNormalizeRules, validateTriggers, validateRules, validateRule, validateDefines, validateVars, validateBindingsProperty, validateUnsafeSettings, validateDurableObjectBinding, validateWorkflowBinding, validateCflogfwdrObject, validateCflogfwdrBinding, validateAssetsConfig, validateNamedSimpleBinding, validateAIBinding, validateVersionMetadataBinding, validateUnsafeBinding, validateBindingArray, validateCloudchamberConfig, validateKVBinding, validateSendEmailBinding, validateQueueBinding, validateR2Binding, validateD1Binding, validateVectorizeBinding, validateHyperdriveBinding, validateVpcServiceBinding, validateBindingsHaveUniqueNames, validateServiceBinding, validateAnalyticsEngineBinding, validateWorkerNamespaceBinding, validateMTlsCertificateBinding, validateConsumer, validateCompatibilityDate, validatePipelineBinding, validateSecretsStoreSecretBinding, validateHelloWorldBinding, validateWorkerLoaderBinding, validateRateLimitBinding, validateMigrations, validateObservability;
 var init_validation = __esm({
   "src/config/validation.ts"() {
     init_import_meta_url();
@@ -106483,6 +106541,18 @@ var init_validation = __esm({
     init_validation_helpers();
     init_config5();
     ENGLISH = new Intl.ListFormat("en-US");
+    ALLOWED_INSTANCE_TYPES = [
+      "lite",
+      "basic",
+      "standard-1",
+      "standard-2",
+      "standard-3",
+      "standard-4",
+      "dev",
+      // legacy
+      "standard"
+      // legacy
+    ];
     __name(isPagesConfig, "isPagesConfig");
     __name(normalizeAndValidateConfig, "normalizeAndValidateConfig");
     __name(applyPythonConfig, "applyPythonConfig");
@@ -107266,9 +107336,9 @@ Please add a binding for "${configBindingName}" to "env.${envName}.${field}.bind
         });
       });
       if ("instance_type" in value && value.instance_type !== void 0) {
-        if (typeof value.instance_type !== "string" || !["dev", "basic", "standard"].includes(value.instance_type)) {
+        if (typeof value.instance_type !== "string" || !ALLOWED_INSTANCE_TYPES.includes(value.instance_type)) {
           diagnostics.errors.push(
-            `"instance_type" should be one of 'dev', 'basic', or 'standard', but got ${value.instance_type}`
+            `"instance_type" should be one of 'lite', 'basic', 'standard-1', 'standard-2', 'standard-3', or 'standard-4', but got ${value.instance_type}`
           );
         }
         if ("memory" in value && value.memory !== void 0 || "vcpu" in value && value.vcpu !== void 0) {
@@ -108616,37 +108686,46 @@ function formatConfigSnippet(snippet, configPath, formatted = true) {
     return formatted ? JSON.stringify(snippet, null, 2) : JSON.stringify(snippet);
   }
 }
-async function updateConfigFile(snippet, configPath, env6, offerToUpdate = true) {
-  const resource = Object.keys(snippet())[0];
+async function updateConfigFile(resource, snippet, configPath, env6, defaults2) {
   const envString = env6 ? ` in the "${env6}" environment` : "";
   logger.log(
     `To access your new ${friendlyBindingNames[resource]} in your Worker, add the following snippet to your configuration file${envString}:`
   );
-  logger.log(formatConfigSnippet(snippet(), configPath));
-  if (configPath && offerToUpdate && configFormat(configPath) === "jsonc") {
-    const autoAdd = await select(
-      "Would you like Wrangler to add it on your behalf?",
+  logger.log(
+    formatConfigSnippet(
       {
-        choices: [
-          { title: "Yes", value: "yes" },
+        [resource]: [
           {
-            title: "Yes, but let me choose the binding name",
-            value: "yes-but"
-          },
-          { title: "No", value: "no" }
-        ],
-        defaultOption: 0,
-        fallbackOption: 2
-      }
-    );
-    let bindingName;
-    if (autoAdd === "yes-but") {
-      bindingName = await prompt("What binding name would you like to use?");
-    }
-    if (autoAdd !== "no") {
+            ...snippet(defaults2?.binding),
+            ...defaults2?.useRemote === true ? { remote: true } : {}
+          }
+        ]
+      },
+      configPath
+    )
+  );
+  if (configPath && configFormat(configPath) === "jsonc") {
+    const writeToConfig = defaults2?.binding ?? defaults2?.updateConfig ?? await confirm("Would you like Wrangler to add it on your behalf?", {
+      defaultValue: true,
+      // We don't want to automatically write to config in CI
+      fallbackValue: false
+    });
+    if (writeToConfig) {
+      const bindingName = defaults2?.binding ?? await prompt("What binding name would you like to use?", {
+        defaultValue: snippet().binding
+      });
+      const useRemote = defaults2?.useRemote ?? (defaults2?.binding || defaults2?.updateConfig ? false : await confirm(
+        "For local dev, do you want to connect to the remote resource instead of a local resource?",
+        { defaultValue: false }
+      ));
+      const configFilePatch = {
+        [resource]: [
+          { ...snippet(bindingName), ...useRemote ? { remote: true } : {} }
+        ]
+      };
       experimental_patchConfig(
         configPath,
-        env6 ? { env: { [env6]: snippet(bindingName) } } : snippet(bindingName),
+        env6 ? { env: { [env6]: configFilePatch } } : configFilePatch,
         true
       );
     }
@@ -108720,7 +108799,7 @@ function readPagesConfig(args, options = {}) {
   }
   return config;
 }
-var import_toml3, parseRawConfigFile, experimental_readRawConfig;
+var import_toml3, sharedResourceCreationArgs, parseRawConfigFile, experimental_readRawConfig;
 var init_config5 = __esm({
   "src/config/index.ts"() {
     init_import_meta_url();
@@ -108738,6 +108817,20 @@ var init_config5 = __esm({
     __name(configFormat, "configFormat");
     __name(configFileName, "configFileName");
     __name(formatConfigSnippet, "formatConfigSnippet");
+    sharedResourceCreationArgs = {
+      "use-remote": {
+        type: "boolean",
+        description: "Use a remote binding when adding the newly created resource to your config"
+      },
+      "update-config": {
+        type: "boolean",
+        description: "Automatically update your config file with the newly added resource"
+      },
+      binding: {
+        type: "string",
+        description: "The binding name of this resource in your Worker"
+      }
+    };
     __name(updateConfigFile, "updateConfigFile");
     __name(readConfig, "readConfig");
     __name(readPagesConfig, "readPagesConfig");
@@ -110372,11 +110465,19 @@ async function fetchInternal(complianceConfig, resource, init4 = {}, queryParams
   logger.debugWithSanitization("RESPONSE:", jsonText);
   logger.debug("-- END CF API RESPONSE");
   if (!jsonText && (response.status === 204 || response.status === 205)) {
-    const emptyBody = `{"result": {}, "success": true, "errors": [], "messages": []}`;
-    return parseJSON(emptyBody);
+    return {
+      response: {
+        result: {},
+        success: true,
+        errors: [],
+        messages: []
+      },
+      status: response.status
+    };
   }
   try {
-    return parseJSON(jsonText);
+    const json = parseJSON(jsonText);
+    return { response: json, status: response.status };
   } catch {
     throw new APIError({
       text: "Received a malformed response from the API",
@@ -110542,22 +110643,15 @@ var init_internal = __esm({
 
 // src/cfetch/index.ts
 async function fetchResult(complianceConfig, resource, init4 = {}, queryParams, abortSignal, apiToken) {
-  const json = await fetchInternal(
-    complianceConfig,
-    resource,
-    init4,
-    queryParams,
-    abortSignal,
-    apiToken
-  );
+  const { response: json, status: status2 } = await fetchInternal(complianceConfig, resource, init4, queryParams, abortSignal, apiToken);
   if (json.success) {
     return json.result;
   } else {
-    throwFetchError(resource, json);
+    throwFetchError(resource, json, status2);
   }
 }
 async function fetchGraphqlResult(complianceConfig, init4 = {}, abortSignal) {
-  const json = await fetchInternal(
+  const { response: json } = await fetchInternal(
     complianceConfig,
     "/graphql",
     { ...init4, method: "POST" },
@@ -110580,12 +110674,7 @@ async function fetchListResult(complianceConfig, resource, init4 = {}, queryPara
       queryParams = new import_node_url5.URLSearchParams(queryParams);
       queryParams.set("cursor", cursor);
     }
-    const json = await fetchInternal(
-      complianceConfig,
-      resource,
-      init4,
-      queryParams
-    );
+    const { response: json, status: status2 } = await fetchInternal(complianceConfig, resource, init4, queryParams);
     if (json.success) {
       results.push(...json.result);
       if (hasCursor(json.result_info)) {
@@ -110594,7 +110683,7 @@ async function fetchListResult(complianceConfig, resource, init4 = {}, queryPara
         getMoreResults = false;
       }
     } else {
-      throwFetchError(resource, json);
+      throwFetchError(resource, json, status2);
     }
   }
   return results;
@@ -110606,12 +110695,7 @@ async function fetchPagedListResult(complianceConfig, resource, init4 = {}, quer
   while (getMoreResults) {
     queryParams = new import_node_url5.URLSearchParams(queryParams);
     queryParams.set("page", String(page));
-    const json = await fetchInternal(
-      complianceConfig,
-      resource,
-      init4,
-      queryParams
-    );
+    const { response: json, status: status2 } = await fetchInternal(complianceConfig, resource, init4, queryParams);
     if (json.success) {
       results.push(...json.result);
       if (hasMorePages(json.result_info)) {
@@ -110620,7 +110704,7 @@ async function fetchPagedListResult(complianceConfig, resource, init4 = {}, quer
         getMoreResults = false;
       }
     } else {
-      throwFetchError(resource, json);
+      throwFetchError(resource, json, status2);
     }
   }
   return results;
@@ -110631,7 +110715,7 @@ function hasMorePages(result_info) {
   const total = result_info?.total_count;
   return page !== void 0 && per_page !== void 0 && total !== void 0 && page * per_page < total;
 }
-function throwFetchError(resource, response) {
+function throwFetchError(resource, response, status2) {
   if (typeof vitest !== "undefined" && !("errors" in response)) {
     throw response;
   }
@@ -110643,7 +110727,8 @@ function throwFetchError(resource, response) {
     notes: [
       ...response.errors.map((err) => ({ text: renderError(err) })),
       ...response.messages?.map((text) => ({ text })) ?? []
-    ]
+    ],
+    status: status2
   });
   const code = response.errors[0]?.code;
   if (code) {
@@ -120333,7 +120418,7 @@ function logStructuredLog({ level, message }, processStream) {
     return logger.info(message);
   }
   if (level === "debug") {
-    return logger.debug(message);
+    return logger.info(message);
   }
   if (level === "error") {
     return logger.error(getSourceMappedString(message));
@@ -127051,9 +127136,24 @@ var init_dist2 = __esm({
 // src/cloudchamber/instance-type/instance-type.ts
 async function promptForInstanceType(allowSkipping) {
   let options = [
-    { label: "dev: 1/16 vCPU, 256 MiB memory, 2 GB disk", value: "dev" },
+    { label: "lite: 1/16 vCPU, 256 MiB memory, 2 GB disk", value: "lite" },
     { label: "basic: 1/4 vCPU, 1 GiB memory, 4 GB disk", value: "basic" },
-    { label: "standard: 1/2 vCPU, 4 GiB memory, 4 GB disk", value: "standard" }
+    {
+      label: "standard-1: 1/2 vCPU, 4 GiB memory, 8 GB disk",
+      value: "standard-1"
+    },
+    {
+      label: "standard-2: 1/2 vCPU, 4 GiB memory, 12 GB disk",
+      value: "standard-2"
+    },
+    {
+      label: "standard-3: 1/2 vCPU, 4 GiB memory, 16 GB disk",
+      value: "standard-3"
+    },
+    {
+      label: "standard-4: 4 vCPU, 4 GiB memory, 20 GB disk",
+      value: "standard-4"
+    }
   ];
   if (allowSkipping) {
     options = [{ label: "Do not set", value: "skip" }].concat(options);
@@ -127066,14 +127166,10 @@ async function promptForInstanceType(allowSkipping) {
     type: "select",
     options
   });
-  switch (action) {
-    case "dev":
-    case "basic":
-    case "standard":
-      return action;
-    default:
-      return void 0;
+  if (instanceTypeNames.includes(action)) {
+    return action;
   }
+  return void 0;
 }
 function checkInstanceType(args, config) {
   const instance_type = args.instanceType ?? config.instance_type;
@@ -127085,15 +127181,12 @@ function checkInstanceType(args, config) {
       `Field "instance_type" is mutually exclusive with "memory" and "vcpu". These fields cannot be set together.`
     );
   }
-  switch (instance_type) {
-    case "dev":
-    case "basic":
-    case "standard":
-      return instance_type;
-    default:
-      throw new UserError2(
-        `"instance_type" field value is expected to be one of "dev", "basic", or "standard", but got "${instance_type}"`
-      );
+  if (instanceTypeNames.includes(instance_type)) {
+    return instance_type;
+  } else {
+    throw new UserError2(
+      `"instance_type" field value is expected to be one of 'lite', 'basic', 'standard-1', 'standard-2', 'standard-3', 'standard-4', but got "${instance_type}"`
+    );
   }
 }
 function getInstanceTypeUsage(instanceType) {
@@ -127120,14 +127213,19 @@ function cleanForInstanceType(app) {
   delete app.configuration.vcpu;
   return app;
 }
-var instanceTypes;
+var instanceTypes, instanceTypeNames;
 var init_instance_type = __esm({
   "src/cloudchamber/instance-type/instance-type.ts"() {
     init_import_meta_url();
     init_interactive();
     init_errors();
     instanceTypes = {
-      // dev is the default instance type when REQUIRE_INSTANCE_TYPE is set
+      // lite is the default instance type when REQUIRE_INSTANCE_TYPE is set
+      lite: {
+        vcpu: 0.0625,
+        memory_mib: 256,
+        disk_mb: 2e3
+      },
       dev: {
         vcpu: 0.0625,
         memory_mib: 256,
@@ -127141,9 +127239,30 @@ var init_instance_type = __esm({
       standard: {
         vcpu: 0.5,
         memory_mib: 4096,
-        disk_mb: 4e3
+        disk_mb: 8e3
+      },
+      "standard-1": {
+        vcpu: 0.5,
+        memory_mib: 4096,
+        disk_mb: 8e3
+      },
+      "standard-2": {
+        vcpu: 1,
+        memory_mib: 6144,
+        disk_mb: 12e3
+      },
+      "standard-3": {
+        vcpu: 2,
+        memory_mib: 8192,
+        disk_mb: 16e3
+      },
+      "standard-4": {
+        vcpu: 4,
+        memory_mib: 12288,
+        disk_mb: 2e4
       }
     };
+    instanceTypeNames = Object.keys(instanceTypes);
     __name(promptForInstanceType, "promptForInstanceType");
     __name(checkInstanceType, "checkInstanceType");
     __name(getInstanceTypeUsage, "getInstanceTypeUsage");
@@ -137551,7 +137670,7 @@ var init_config6 = __esm({
         const shared = {
           name: container.name,
           class_name: container.class_name,
-          max_instances: container.max_instances ?? 1,
+          max_instances: container.max_instances ?? 20,
           scheduling_policy: container.scheduling_policy ?? "default" /* DEFAULT */,
           constraints: {
             // if the tier is -1, then we allow all tiers
@@ -137584,7 +137703,7 @@ var init_config6 = __esm({
           };
         } else if (typeof container.instance_type === "string" || container.instance_type === void 0) {
           instanceTypeOrLimits = {
-            instance_type: container.instance_type ?? "dev" /* DEV */
+            instance_type: container.instance_type ?? "lite" /* LITE */
           };
         } else {
           instanceTypeOrLimits = {
@@ -137742,10 +137861,11 @@ var init_create = __esm({
 						enam: Eastern North America
 
 					`
-        }
+        },
+        ...sharedResourceCreationArgs
       },
       positionalArgs: ["name"],
-      async handler({ name: name2, location, env: env6 }, { config }) {
+      async handler({ name: name2, location, env: env6, ...args }, { config }) {
         const accountId = await requireAuth(config);
         const db = await createD1Database(config, accountId, name2, location);
         logger.log(
@@ -137753,17 +137873,15 @@ var init_create = __esm({
         );
         logger.log("Created your new D1 database.\n");
         await updateConfigFile(
+          "d1_databases",
           (bindingName) => ({
-            d1_databases: [
-              {
-                binding: getValidBindingName(bindingName ?? db.name, "DB"),
-                database_name: db.name,
-                database_id: db.uuid
-              }
-            ]
+            binding: getValidBindingName(bindingName ?? db.name, "DB"),
+            database_name: db.name,
+            database_id: db.uuid
           }),
           config.configPath,
-          env6
+          env6,
+          args
         );
       }
     });
@@ -140708,7 +140826,7 @@ async function retryOnAPIFailure(action, backoff = 0, attempts = MAX_ATTEMPTS) {
     } else if (!(err instanceof TypeError)) {
       throw err;
     }
-    logger.info(source_default.dim(`Retrying API call after error...`));
+    logger.debug(source_default.dim(`Retrying API call after error...`));
     logger.debug(err);
     if (attempts <= 1) {
       throw err;
@@ -141119,10 +141237,71 @@ function getSubdomainValues(config_workers_dev, config_preview_urls, routes) {
     preview_urls: config_preview_urls ?? defaultPreviewUrls
   };
 }
+async function validateSubdomainMixedState(props, accountId, scriptName, configFlags, desired, remote, firstDeploy) {
+  const { config } = props;
+  const changed = desired.workers_dev !== remote.workers_dev || desired.preview_urls !== remote.preview_urls;
+  if (!changed) {
+    return desired;
+  }
+  if (getSubdomainMixedStateCheckDisabled()) {
+    return desired;
+  }
+  if (isNonInteractiveOrCI()) {
+    return desired;
+  }
+  if (firstDeploy) {
+    return desired;
+  }
+  if (desired.workers_dev === desired.preview_urls) {
+    return desired;
+  }
+  const userSubdomain = await getWorkersDevSubdomain(
+    config,
+    accountId,
+    config.configPath
+  );
+  const previewUrl = `https://<VERSION_PREFIX>-${scriptName}.${userSubdomain}`;
+  if (!desired.workers_dev && desired.preview_urls) {
+    logger.warn(
+      [
+        "You are disabling the 'workers.dev' subdomain for this Worker, but Preview URLs are still enabled.",
+        "Preview URLs will automatically generate a unique, shareable link for each new version which will be accessible at:",
+        `  ${previewUrl}`,
+        "",
+        "To prevent this Worker from being unintentionally public, you may want to disable the Preview URLs as well by setting `preview_urls = false` in your Wrangler config file."
+      ].join("\n")
+    );
+  }
+  if (desired.workers_dev && !desired.preview_urls) {
+    logger.warn(
+      [
+        "You are enabling the 'workers.dev' subdomain for this Worker, but Preview URLs are still disabled.",
+        "Preview URLs will automatically generate a unique, shareable link for each new version which will be accessible at:",
+        `  ${previewUrl}`,
+        "",
+        "You may want to enable the Preview URLs as well by setting `preview_urls = true` in your Wrangler config file."
+      ].join("\n")
+    );
+  }
+  return desired;
+}
 async function subdomainDeploy(props, accountId, scriptName, envName, workerUrl, routes, deployments, firstDeploy) {
   const { config } = props;
-  const { workers_dev: wantWorkersDev, preview_urls: wantPreviews } = getSubdomainValues(config.workers_dev, config.preview_urls, routes);
   const { enabled: currWorkersDev, previews_enabled: currPreviews } = await fetchResult(config, `${workerUrl}/subdomain`);
+  const desiredSubdomain = await getSubdomainValues(
+    config.workers_dev,
+    config.preview_urls,
+    routes
+  );
+  const { workers_dev: wantWorkersDev, preview_urls: wantPreviews } = await validateSubdomainMixedState(
+    props,
+    accountId,
+    scriptName,
+    config,
+    desiredSubdomain,
+    { workers_dev: currWorkersDev, preview_urls: currPreviews },
+    firstDeploy
+  );
   const workersDevInSync = wantWorkersDev === currWorkersDev;
   const previewsInSync = wantPreviews === currPreviews;
   const allInSync = [workersDevInSync, previewsInSync].every((v8) => v8);
@@ -141154,17 +141333,19 @@ async function subdomainDeploy(props, accountId, scriptName, envName, workerUrl,
     workersDevURL = props.legacyEnv || !props.env ? `${scriptName}.${userSubdomain}` : `${envName}.${scriptName}.${userSubdomain}`;
   }
   if (!allInSync) {
-    await fetchResult(config, `${workerUrl}/subdomain`, {
-      method: "POST",
-      body: JSON.stringify({
-        enabled: wantWorkersDev,
-        previews_enabled: wantPreviews
-      }),
-      headers: {
-        "Content-Type": "application/json",
-        "Cloudflare-Workers-Script-Api-Date": "2025-08-01"
-      }
-    });
+    await retryOnAPIFailure(
+      async () => fetchResult(config, `${workerUrl}/subdomain`, {
+        method: "POST",
+        body: JSON.stringify({
+          enabled: wantWorkersDev,
+          previews_enabled: wantPreviews
+        }),
+        headers: {
+          "Content-Type": "application/json",
+          "Cloudflare-Workers-Script-Api-Date": "2025-08-01"
+        }
+      })
+    );
   }
   if (workersDevURL) {
     deployments.push(Promise.resolve([workersDevURL]));
@@ -141183,7 +141364,9 @@ var init_deploy3 = __esm({
     init_dist2();
     init_cfetch();
     init_deploy8();
+    init_misc_variables();
     init_errors();
+    init_is_interactive();
     init_logger();
     init_client2();
     init_routes5();
@@ -141191,6 +141374,7 @@ var init_deploy3 = __esm({
     init_zones3();
     __name(triggersDeploy, "triggersDeploy");
     __name(getSubdomainValues, "getSubdomainValues");
+    __name(validateSubdomainMixedState, "validateSubdomainMixedState");
     __name(subdomainDeploy, "subdomainDeploy");
   }
 });
@@ -149476,7 +149660,7 @@ function containerAppToInstanceType(containerApp) {
     };
   }
   if (configuration.disk?.size_mb === void 0 && configuration.vcpu === void 0 && configuration.memory_mib === void 0) {
-    return { instance_type: "dev" /* DEV */ };
+    return { instance_type: "lite" /* LITE */ };
   }
   return configuration;
 }
@@ -149551,7 +149735,7 @@ async function apply2(args, config) {
       image: "docker.io/cloudflare/hello-world:1.0",
       instances: 2,
       name: config.name ?? "my-containers-application",
-      instance_type: "dev"
+      instance_type: "lite"
     };
     const endConfig = args.env !== void 0 ? {
       env: { [args.env]: { containers: [configuration] } }
@@ -150667,7 +150851,14 @@ function createCommandOptionalYargs(yargs) {
     describe: "ID of the SSH key to add to the deployment"
   }).option("instance-type", {
     requiresArg: true,
-    choices: ["dev", "basic", "standard"],
+    choices: [
+      "lite",
+      "basic",
+      "standard-1",
+      "standard-2",
+      "standard-3",
+      "standard-4"
+    ],
     demandOption: false,
     describe: "Instance type to allocate to this deployment"
   }).option("vcpu", {
@@ -155684,10 +155875,15 @@ var init_deploy4 = __esm({
           choices: ["immediate", "gradual"]
         },
         "experimental-deploy-remote-diff-check": {
-          describe: `Experimental: Enable The Deployment Remote Diff check`,
+          describe: "Experimental: Enable The Deployment Remote Diff check",
           type: "boolean",
           hidden: true,
           alias: ["x-remote-diff-check"]
+        },
+        strict: {
+          describe: "Enables strict mode for the deploy command, this prevents deployments to occur when there are even small potential risks.",
+          type: "boolean",
+          default: false
         }
       },
       behaviour: {
@@ -155703,7 +155899,7 @@ var init_deploy4 = __esm({
       validateArgs(args) {
         if (args.nodeCompat) {
           throw new UserError2(
-            `The --node-compat flag is no longer supported as of Wrangler v4. Instead, use the \`nodejs_compat\` compatibility flag. This includes the functionality from legacy \`node_compat\` polyfills and natively implemented Node.js APIs. See https://developers.cloudflare.com/workers/runtime-apis/nodejs for more information.`,
+            "The --node-compat flag is no longer supported as of Wrangler v4. Instead, use the `nodejs_compat` compatibility flag. This includes the functionality from legacy `node_compat` polyfills and natively implemented Node.js APIs. See https://developers.cloudflare.com/workers/runtime-apis/nodejs for more information.",
             { telemetryMessage: true }
           );
         }
@@ -155811,7 +156007,8 @@ var init_deploy4 = __esm({
           projectRoot,
           dispatchNamespace: args.dispatchNamespace,
           experimentalAutoCreate: args.experimentalAutoCreate,
-          containersRollout: args.containersRollout
+          containersRollout: args.containersRollout,
+          strict: args.strict
         });
         writeOutput({
           type: "deploy",
@@ -156659,7 +156856,19 @@ var init_create4 = __esm({
           demandOption: true,
           description: "The name of the Hyperdrive config"
         },
-        ...upsertOptions("postgresql")
+        ...upsertOptions("postgresql"),
+        binding: {
+          type: "string",
+          description: "The binding name of this resource in your Worker"
+        },
+        "use-remote": {
+          type: "boolean",
+          description: "Use a remote binding when adding the newly created resource to your config"
+        },
+        "update-config": {
+          type: "boolean",
+          description: "Automatically update your config file with the newly added resource"
+        }
       },
       positionalArgs: ["name"],
       async handler(args, { config }) {
@@ -156676,16 +156885,14 @@ var init_create4 = __esm({
           `\u2705 Created new Hyperdrive ${capitalizeScheme(database.origin.scheme)} config: ${database.id}`
         );
         await updateConfigFile(
+          "hyperdrive",
           (name2) => ({
-            hyperdrive: [
-              {
-                binding: getValidBindingName(name2 ?? "HYPERDRIVE", "HYPERDRIVE"),
-                id: database.id
-              }
-            ]
+            binding: getValidBindingName(name2 ?? "HYPERDRIVE", "HYPERDRIVE"),
+            id: database.id
           }),
           config.configPath,
-          args.env
+          args.env,
+          args
         );
       }
     });
@@ -157343,7 +157550,8 @@ var init_kv2 = __esm({
         preview: {
           type: "boolean",
           describe: "Interact with a preview namespace"
-        }
+        },
+        ...sharedResourceCreationArgs
       },
       positionalArgs: ["namespace"],
       async handler(args, { sdk }) {
@@ -157364,17 +157572,14 @@ var init_kv2 = __esm({
         logger.log("\u2728 Success!");
         const previewString = args.preview ? "preview_" : "";
         await updateConfigFile(
+          "kv_namespaces",
           (name2) => ({
-            kv_namespaces: [
-              {
-                binding: getValidBindingName(name2 ?? args.namespace, "KV"),
-                [`${previewString}id`]: namespaceId
-              }
-            ]
+            binding: getValidBindingName(name2 ?? args.namespace, "KV"),
+            [`${previewString}id`]: namespaceId
           }),
           config.configPath,
           args.env,
-          !args.preview
+          { ...args, updateConfig: preview ? false : args.updateConfig }
         );
       }
     });
@@ -164379,7 +164584,8 @@ var init_deployments4 = __esm({
         hideGlobalFlags: ["config", "env"]
       },
       behaviour: {
-        provideConfig: false
+        provideConfig: false,
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
       },
       args: {
         "project-name": {
@@ -199865,18 +200071,14 @@ async function displayUsageExamples(stream2, config, args) {
 Send your first event to stream '${stream2.name}':`);
   logger.log("\nWorker Integration:");
   await updateConfigFile(
+    "pipelines",
     (customBindingName) => ({
-      pipelines: [
-        {
-          pipeline: stream2.id,
-          binding: customBindingName ?? bindingName
-        }
-      ]
+      pipeline: stream2.id,
+      binding: customBindingName ?? bindingName
     }),
     config.configPath,
     args.env,
-    false
-    // Don't offer to update automatically
+    { updateConfig: false }
   );
   logger.log("\nIn your Worker:");
   logger.log(`await env.${bindingName}.send([${exampleData}]);`);
@@ -200500,6 +200702,9 @@ var init_get2 = __esm({
         owner: "Product: Pipelines",
         status: "open-beta"
       },
+      behaviour: {
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
+      },
       args: {
         pipeline: {
           type: "string",
@@ -200595,6 +200800,9 @@ var init_list5 = __esm({
         owner: "Product: Pipelines",
         status: "open-beta"
       },
+      behaviour: {
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
+      },
       args: {
         page: {
           describe: "Page number for pagination",
@@ -201800,6 +202008,9 @@ var init_get3 = __esm({
         owner: "Product: Pipelines",
         status: "open-beta"
       },
+      behaviour: {
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
+      },
       positionalArgs: ["sink"],
       args: {
         sink: {
@@ -201848,6 +202059,9 @@ var init_list6 = __esm({
         owner: "Product: Pipelines",
         status: "open-beta"
       },
+      behaviour: {
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
+      },
       args: {
         page: {
           describe: "Page number for pagination",
@@ -202092,6 +202306,9 @@ var init_get4 = __esm({
         owner: "Product: Pipelines",
         status: "open-beta"
       },
+      behaviour: {
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
+      },
       positionalArgs: ["stream"],
       args: {
         stream: {
@@ -202136,6 +202353,9 @@ var init_list7 = __esm({
         owner: "Product: Pipelines",
         status: "open-beta"
       },
+      behaviour: {
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
+      },
       args: {
         page: {
           describe: "Page number for pagination",
@@ -203940,6 +204160,9 @@ var init_get5 = __esm({
         owner: "Product: Queues",
         status: "stable"
       },
+      behaviour: {
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
+      },
       positionalArgs: ["queue"],
       args: {
         queue: {
@@ -204001,6 +204224,9 @@ var init_list9 = __esm({
         owner: "Product: Queues",
         status: "stable"
       },
+      behaviour: {
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
+      },
       positionalArgs: ["queue"],
       args: {
         queue: {
@@ -204068,6 +204294,9 @@ var init_update3 = __esm({
         owner: "Product: Queues",
         status: "stable"
       },
+      behaviour: {
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
+      },
       positionalArgs: ["queue"],
       args: {
         queue: {
@@ -204307,7 +204536,8 @@ var init_bucket = __esm({
           alias: "J",
           requiresArg: true,
           type: "string"
-        }
+        },
+        ...sharedResourceCreationArgs
       },
       async handler(args, { config }) {
         const accountId = await requireAuth(config);
@@ -204338,16 +204568,14 @@ var init_bucket = __esm({
         logger.log(esm_default2`
 			✅ Created bucket '${fullBucketName}' with${location ? ` location hint ${location} and` : ``} default storage class of ${storageClass ? storageClass : `Standard`}.`);
         await updateConfigFile(
+          "r2_buckets",
           (bindingName) => ({
-            r2_buckets: [
-              {
-                bucket_name: args.name,
-                binding: getValidBindingName(bindingName ?? args.name, "r2")
-              }
-            ]
+            bucket_name: args.name,
+            binding: getValidBindingName(bindingName ?? args.name, "r2")
           }),
           config.configPath,
-          args.env
+          args.env,
+          args
         );
         sendMetricsEvent("create r2 bucket", {
           sendMetrics: config.send_metrics
@@ -218291,7 +218519,8 @@ function addBreadcrumb2(message, level = "log") {
 }
 async function captureGlobalException(e8) {
   if (true) {
-    sentryReportingAllowed = await confirm(
+    const sendErrorReportsEnvVar = getWranglerSendErrorReportsFromEnv();
+    sentryReportingAllowed = sendErrorReportsEnvVar !== void 0 ? sendErrorReportsEnvVar : await confirm(
       "Would you like to report this error to Cloudflare? Wrangler's output and the error details will be shared with the Wrangler team to help us diagnose and fix the issue.",
       { fallbackValue: false }
     );
@@ -218317,6 +218546,7 @@ var init_sentry = __esm({
     import_undici17 = __toESM(require_undici());
     init_package();
     init_dialogs();
+    init_misc_variables();
     init_logger();
     sentryReportingAllowed = false;
     makeSentry10Transport = /* @__PURE__ */ __name((options) => {
@@ -220313,7 +220543,8 @@ var init_create10 = __esm({
           deprecated: true,
           default: deprecatedV1DefaultFlag,
           description: "Create a deprecated Vectorize V1 index. This is not recommended and indexes created with this option need all other Vectorize operations to have this option enabled."
-        }
+        },
+        ...sharedResourceCreationArgs
       },
       positionalArgs: ["name"],
       async handler(args, { config }) {
@@ -220359,16 +220590,14 @@ var init_create10 = __esm({
           `\u2705 Successfully created a new Vectorize index: '${indexResult.name}'`
         );
         await updateConfigFile(
+          "vectorize",
           (name2) => ({
-            vectorize: [
-              {
-                binding: getValidBindingName(name2 ?? bindingName, bindingName),
-                index_name: indexResult.name
-              }
-            ]
+            binding: getValidBindingName(name2 ?? bindingName, bindingName),
+            index_name: indexResult.name
           }),
           config.configPath,
-          args.env
+          args.env,
+          args
         );
       }
     });
@@ -222102,7 +222331,7 @@ var init_list12 = __esm({
         }
       },
       behaviour: {
-        printBanner: false
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
       },
       handler: /* @__PURE__ */ __name(async function versionsDeploymentsListHandler(args, { config }) {
         sendMetricsEvent(
@@ -222186,7 +222415,6 @@ var init_status3 = __esm({
     init_metrics2();
     init_user3();
     init_render_labelled_values();
-    init_wrangler_banner();
     init_api();
     init_list12();
     BLANK_INPUT4 = "-";
@@ -222209,12 +222437,9 @@ var init_status3 = __esm({
         }
       },
       behaviour: {
-        printBanner: false
+        printBanner: /* @__PURE__ */ __name((args) => !args.json, "printBanner")
       },
       handler: /* @__PURE__ */ __name(async function versionsDeploymentsStatusHandler(args, { config }) {
-        if (!args.json) {
-          await printWranglerBanner();
-        }
         sendMetricsEvent(
           "view latest versioned deployment",
           {},
@@ -229282,6 +229507,13 @@ async function main(argv) {
     (args) => {
       if (Object.keys(LOGGER_LEVELS).includes(args.logLevel)) {
         logger.loggerLevel = args.logLevel;
+        setLogLevel(args.logLevel);
+      }
+      const envLogLevel = getEnvironmentVariableFactory({
+        variableName: "WRANGLER_LOG"
+      })()?.toLowerCase();
+      if (envLogLevel) {
+        setLogLevel(envLogLevel);
       }
       if (recordedCommand) {
         return;
@@ -229346,7 +229578,7 @@ async function main(argv) {
         logger.error(e8.cause);
       } else {
         (0, import_node_assert22.default)(isAuthenticationError(e8));
-        logger.log(formatMessage(e8));
+        logger.error(e8);
       }
       const envAuth = getAuthFromEnv();
       if (envAuth !== void 0 && "apiToken" in envAuth) {
@@ -229367,7 +229599,7 @@ async function main(argv) {
       e8.notes.push({
         text: "\nIf you think this is a bug, please open an issue at: https://github.com/cloudflare/workers-sdk/issues/new/choose"
       });
-      logger.log(formatMessage(e8));
+      logger.error(e8);
     } else if (e8 instanceof JsonFriendlyFatalError) {
       logger.log(e8.message);
     } else if (e8 instanceof Error && e8.message.includes("Raw mode is not supported on")) {
@@ -229398,7 +229630,7 @@ ${tryRunningItIn}${oneOfThese}`
       error2.notes.push({
         text: "\nIf you think this is a bug, please open an issue at: https://github.com/cloudflare/workers-sdk/issues/new/choose"
       });
-      logger.log(formatMessage(error2));
+      logger.error(error2);
     } else {
       if (
         // Is this a StartDevEnv error event? If so, unwrap the cause, which is usually the user-recognisable error
@@ -229512,6 +229744,7 @@ var init_src2 = __esm({
     init_dev2();
     init_dispatch_namespace();
     init_docs();
+    init_factory();
     init_misc_variables();
     init_errors();
     init_hello_world();
@@ -230263,6 +230496,7 @@ Update them to point to this script instead?`;
   return domains.map((domain2) => renderRoute(domain2));
 }
 async function deploy(props) {
+  const deployConfirm = getDeployConfirmFunction(props.strict);
   const { config, accountId, name: name2, entry } = props;
   let workerTag = null;
   let versionId = null;
@@ -230305,7 +230539,7 @@ ${configDiff.diff}
 
 Deploying the Worker will override the remote configuration with your local one.`
             );
-            if (!await confirm("Would you like to continue?")) {
+            if (!await deployConfirm("Would you like to continue?")) {
               return { versionId, workerTag };
             }
           }
@@ -230314,7 +230548,7 @@ Deploying the Worker will override the remote configuration with your local one.
             `You are about to publish a Workers Service that was last published via the Cloudflare Dashboard.
 Edits that have been made via the dashboard will be overridden by your local code and config.`
           );
-          if (!await confirm("Would you like to continue?")) {
+          if (!await deployConfirm("Would you like to continue?")) {
             return { versionId, workerTag };
           }
         }
@@ -230323,7 +230557,7 @@ Edits that have been made via the dashboard will be overridden by your local cod
           `You are about to publish a Workers Service that was last updated via the script API.
 Edits that have been made via the script API will be overridden by your local code and config.`
         );
-        if (!await confirm("Would you like to continue?")) {
+        if (!await deployConfirm("Would you like to continue?")) {
           return { versionId, workerTag };
         }
       }
@@ -230902,7 +231136,7 @@ async function publishRoutesFallback(complianceConfig, routes, {
       { telemetryMessage: true }
     );
   }
-  logger.warn(
+  logger.info(
     "The current authentication token does not have 'All Zones' permissions.\nFalling back to using the zone-based API endpoint to update each route individually.\nNote that there is no access to routes associated with zones that the API token does not have permission for.\nExisting routes for this Worker in such zones will not be deleted."
   );
   const deployedRoutes = [];
@@ -231067,6 +231301,19 @@ async function updateQueueConsumers(scriptName, config) {
   }
   return updateConsumers;
 }
+function getDeployConfirmFunction(strictMode = false) {
+  const nonInteractive = isNonInteractiveOrCI();
+  if (nonInteractive && strictMode) {
+    return async () => {
+      logger.error(
+        "Aborting the deployment operation because of conflicts. To override and deploy anyway remove the `--strict` flag"
+      );
+      process.exitCode = 1;
+      return false;
+    };
+  }
+  return confirm;
+}
 var import_node_assert23, import_node_fs36, import_node_path56, import_node_url10, import_undici22, validateRoutes3;
 var init_deploy8 = __esm({
   "src/deploy/deploy.ts"() {
@@ -231099,6 +231346,7 @@ var init_deploy8 = __esm({
     init_environments();
     init_errors();
     init_experimental_flags();
+    init_is_interactive();
     init_logger();
     init_metrics2();
     init_navigator_user_agent();
@@ -231178,6 +231426,7 @@ ${mountedAssetRoutes.map((route) => {
     __name(publishRoutesFallback, "publishRoutesFallback");
     __name(isAuthenticationError, "isAuthenticationError");
     __name(updateQueueConsumers, "updateQueueConsumers");
+    __name(getDeployConfirmFunction, "getDeployConfirmFunction");
   }
 });
 
@@ -252412,7 +252661,7 @@ var init_ProxyController = __esm({
 
 // src/utils/isAbortError.ts
 function isAbortError(err) {
-  const legacyAbortErroCheck = err.code !== "ABORT_ERR";
+  const legacyAbortErroCheck = err.code == "ABORT_ERR";
   const abortErrorCheck = err instanceof Error && err.name == "AbortError";
   return legacyAbortErroCheck || abortErrorCheck;
 }
@@ -252584,7 +252833,7 @@ var init_create_worker_preview = __esm({
 // src/dev/remote.ts
 function handlePreviewSessionUploadError(err, accountId) {
   (0, import_node_assert30.default)(err && typeof err === "object");
-  if (isAbortError(err)) {
+  if (!isAbortError(err)) {
     if ("code" in err && err.code === 10049) {
       logger.log("Preview token expired, fetching a new one");
       return true;
@@ -252597,12 +252846,9 @@ function handlePreviewSessionUploadError(err, accountId) {
 function handlePreviewSessionCreationError(err, accountId) {
   (0, import_node_assert30.default)(err && typeof err === "object");
   if ("code" in err && err.code === 10063) {
-    const errorMessage = "Error: You need to register a workers.dev subdomain before running the dev command in remote mode";
-    const solutionMessage = "You can either enable local mode by pressing l, or register a workers.dev subdomain here:";
-    const onboardingLink = `https://dash.cloudflare.com/${accountId}/workers/onboarding`;
-    logger.error(`${errorMessage}
-${solutionMessage}
-${onboardingLink}`);
+    logger.error(
+      `You need to register a workers.dev subdomain before running the dev command in remote mode. You can either enable local mode by pressing l, or register a workers.dev subdomain here: https://dash.cloudflare.com/${accountId}/workers/onboarding`
+    );
   } else if ("cause" in err && err.cause?.code === "ENOTFOUND") {
     logger.error(
       `Could not access \`${err.cause.hostname}\`. Make sure the domain is set up to be proxied by Cloudflare.
@@ -252610,7 +252856,7 @@ For more details, refer to https://developers.cloudflare.com/workers/configurati
     );
   } else if (err instanceof UserError2) {
     logger.error(err.message);
-  } else if (isAbortError(err)) {
+  } else if (!isAbortError(err)) {
     logger.error("Error while creating remote dev session:", err);
   }
 }
@@ -252723,34 +252969,30 @@ async function getWorkerAccountAndContext(props) {
   return { workerAccount, workerContext };
 }
 function handleUserFriendlyError(error2, accountId) {
-  switch (error2.code) {
-    // code 10021 is a validation error
-    case 10021: {
-      if (error2.notes[0].text === "binding DB of type d1 must have a valid `id` specified [code: 10021]") {
-        const errorMessage = "Error: You must use a real database in the preview_database_id configuration.";
-        const solutionMessage = "You can find your databases using 'wrangler d1 list', or read how to develop locally with D1 here:";
-        const documentationLink = `https://developers.cloudflare.com/d1/configuration/local-development`;
+  if (error2 instanceof APIError) {
+    switch (error2.code) {
+      // code 10021 is a validation error
+      case 10021: {
+        if (error2.notes[0].text === "binding DB of type d1 must have a valid `id` specified [code: 10021]") {
+          logger.error(
+            `You must use a real database in the preview_database_id configuration. You can find your databases using 'wrangler d1 list', or read how to develop locally with D1 here: https://developers.cloudflare.com/d1/configuration/local-development`
+          );
+          return true;
+        }
+        return false;
+      }
+      // for error 10063 (workers.dev subdomain required)
+      case 10063: {
+        const onboardingLink = accountId ? `https://dash.cloudflare.com/${accountId}/workers/onboarding` : "https://dash.cloudflare.com/?to=/:account/workers/onboarding";
         logger.error(
-          `${errorMessage}
-${solutionMessage}
-${documentationLink}`
+          `You need to register a workers.dev subdomain before running the dev command in remote mode. You can either enable local mode by pressing l, or register a workers.dev subdomain here: ${onboardingLink}`
         );
         return true;
       }
-      return false;
-    }
-    // for error 10063 (workers.dev subdomain required)
-    case 10063: {
-      const errorMessage = "Error: You need to register a workers.dev subdomain before running the dev command in remote mode";
-      const solutionMessage = "You can either enable local mode by pressing l, or register a workers.dev subdomain here:";
-      const onboardingLink = accountId ? `https://dash.cloudflare.com/${accountId}/workers/onboarding` : "https://dash.cloudflare.com/?to=/:account/workers/onboarding";
-      logger.error(`${errorMessage}
-${solutionMessage}
-${onboardingLink}`);
-      return true;
-    }
-    default: {
-      return false;
+      default: {
+        logger.error(error2);
+        return true;
+      }
     }
   }
 }
@@ -252767,6 +253009,7 @@ var init_remote = __esm({
     init_dev2();
     init_errors();
     init_logger();
+    init_parse();
     init_sites2();
     init_user3();
     init_isAbortError();
@@ -253241,7 +253484,7 @@ var init_DevEnv = __esm({
 `, ev.cause);
           logger.debug("=> Error contextual data:", ev.data);
         } else if (ev.source === "ConfigController" && ev.cause instanceof ParseError) {
-          logger.log(formatMessage(ev.cause));
+          logger.error(ev.cause);
         } else {
           this.emit("error", ev);
         }