wrangler 4.28.0 → 4.29.0

package/wrangler-dist/cli.js

@@ -16970,7 +16970,7 @@ var require_response = __commonJS({
     var assert45 = require("assert");
     var { types } = require("util");
     var textEncoder = new TextEncoder("utf-8");
-    var Response13 = class _Response {
+    var Response12 = class _Response {
       static {
         __name(this, "Response");
       }
@@ -17142,13 +17142,13 @@ var require_response = __commonJS({
         response.#state = newState;
       }
     };
-    var { getResponseHeaders, setResponseHeaders, getResponseState, setResponseState } = Response13;
-    Reflect.deleteProperty(Response13, "getResponseHeaders");
-    Reflect.deleteProperty(Response13, "setResponseHeaders");
-    Reflect.deleteProperty(Response13, "getResponseState");
-    Reflect.deleteProperty(Response13, "setResponseState");
-    mixinBody(Response13, getResponseState);
-    Object.defineProperties(Response13.prototype, {
+    var { getResponseHeaders, setResponseHeaders, getResponseState, setResponseState } = Response12;
+    Reflect.deleteProperty(Response12, "getResponseHeaders");
+    Reflect.deleteProperty(Response12, "setResponseHeaders");
+    Reflect.deleteProperty(Response12, "getResponseState");
+    Reflect.deleteProperty(Response12, "setResponseState");
+    mixinBody(Response12, getResponseState);
+    Object.defineProperties(Response12.prototype, {
       type: kEnumerableProperty,
       url: kEnumerableProperty,
       status: kEnumerableProperty,
@@ -17164,7 +17164,7 @@ var require_response = __commonJS({
         configurable: true
       }
     });
-    Object.defineProperties(Response13, {
+    Object.defineProperties(Response12, {
       json: kEnumerableProperty,
       redirect: kEnumerableProperty,
       error: kEnumerableProperty
@@ -17305,7 +17305,7 @@ var require_response = __commonJS({
     }
     __name(initializeResponse, "initializeResponse");
     function fromInnerResponse(innerResponse, guard) {
-      const response = new Response13(kConstruct);
+      const response = new Response12(kConstruct);
       setResponseState(response, innerResponse);
       const headers = new Headers5(kConstruct);
       setResponseHeaders(response, headers);
@@ -17360,14 +17360,14 @@ var require_response = __commonJS({
         converter: webidl.converters.HeadersInit
       }
     ]);
-    webidl.is.Response = webidl.util.MakeTypeAssertion(Response13);
+    webidl.is.Response = webidl.util.MakeTypeAssertion(Response12);
     module3.exports = {
       isNetworkError,
       makeNetworkError,
       makeResponse,
       makeAppropriateNetworkError,
       filterResponse,
-      Response: Response13,
+      Response: Response12,
       cloneResponse,
       fromInnerResponse,
       getResponseState
@@ -18250,7 +18250,7 @@ var require_fetch = __commonJS({
       finalizeAndReportTiming(response, "fetch");
     }
     __name(handleFetchDone, "handleFetchDone");
-    function fetch14(input, init3 = void 0) {
+    function fetch13(input, init3 = void 0) {
       webidl.argumentLengthCheck(arguments, 1, "globalThis.fetch");
       let p6 = createDeferredPromise();
       let requestObject;
@@ -18307,7 +18307,7 @@ var require_fetch = __commonJS({
       });
       return p6.promise;
     }
-    __name(fetch14, "fetch");
+    __name(fetch13, "fetch");
     function finalizeAndReportTiming(response, initiatorType = "other") {
       if (response.type === "error" && response.aborted) {
         return;
@@ -19222,7 +19222,7 @@ var require_fetch = __commonJS({
     }
     __name(httpNetworkFetch, "httpNetworkFetch");
     module3.exports = {
-      fetch: fetch14,
+      fetch: fetch13,
       Fetch,
       fetching,
       finalizeAndReportTiming
@@ -23168,7 +23168,7 @@ var require_undici = __commonJS({
     module3.exports.setGlobalDispatcher = setGlobalDispatcher2;
     module3.exports.getGlobalDispatcher = getGlobalDispatcher2;
     var fetchImpl = require_fetch().fetch;
-    module3.exports.fetch = /* @__PURE__ */ __name(async function fetch14(init3, options = void 0) {
+    module3.exports.fetch = /* @__PURE__ */ __name(async function fetch13(init3, options = void 0) {
       try {
         return await fetchImpl(init3, options);
       } catch (err) {
@@ -23923,7 +23923,8 @@ var init_OpenAPI = __esm({
       USERNAME: void 0,
       PASSWORD: void 0,
       HEADERS: void 0,
-      ENCODE_PATH: void 0
+      ENCODE_PATH: void 0,
+      LOGGER: void 0
     };
   }
 });
@@ -24387,7 +24388,7 @@ var init_UpdateApplicationRolloutRequest = __esm({
 });
 
 // ../containers-shared/src/client/core/request.ts
-var isDefined, isString, isStringWithValue, isBlob, base64, getQueryString, getUrl, getFormData, resolve5, getHeaders, getRequestBody, isResponseSchemaV4, parseResponseSchemaV4, sendRequest, getResponseHeader, getResponseBody, catchErrorCodes, request;
+var isDefined, isString, isStringWithValue, isBlob, base64, getQueryString, getUrl, getFormData, resolve5, getHeaders, getRequestBody, isResponseSchemaV4, parseResponseSchemaV4, sendRequest, getResponseHeader, getResponseBody, catchErrorCodes, request, debugLogRequest, debugLogResponse;
 var init_request = __esm({
   "../containers-shared/src/client/core/request.ts"() {
     init_import_meta_url();
@@ -24623,6 +24624,7 @@ var init_request = __esm({
           const formData = getFormData(options);
           const body = getRequestBody(options);
           const headers = await getHeaders(config, options);
+          debugLogRequest(config, url4, headers, formData ?? body ?? {});
           if (!onCancel.isCancelled) {
             const response = await sendRequest(
               config,
@@ -24655,6 +24657,7 @@ var init_request = __esm({
                 body: responseHeader ?? responseBody
               };
             }
+            debugLogResponse(config, result);
             catchErrorCodes(options, result);
             resolve25(result.body);
           }
@@ -24663,6 +24666,33 @@ var init_request = __esm({
         }
       });
     }, "request");
+    debugLogRequest = /* @__PURE__ */ __name(async (config, url4, headers, body) => {
+      config.LOGGER?.debug(`-- START CF API REQUEST: ${url4}`);
+      const logHeaders = new Headers(headers);
+      logHeaders.delete("Authorization");
+      config.LOGGER?.debugWithSanitization(
+        "HEADERS:",
+        JSON.stringify(logHeaders, null, 2)
+      );
+      config.LOGGER?.debugWithSanitization(
+        "BODY:",
+        JSON.stringify(
+          body instanceof FormData ? await new Response(body).text() : body,
+          null,
+          2
+        )
+      );
+      config.LOGGER?.debug("-- END CF API REQUEST");
+    }, "debugLogRequest");
+    debugLogResponse = /* @__PURE__ */ __name((config, response) => {
+      config.LOGGER?.debug(
+        "-- START CF API RESPONSE:",
+        response.statusText,
+        response.status
+      );
+      config.LOGGER?.debugWithSanitization("RESPONSE:", response.body);
+      config.LOGGER?.debug("-- END CF API RESPONSE");
+    }, "debugLogResponse");
   }
 });
 
@@ -33117,6 +33147,38 @@ var require_signal_exit = __commonJS({
   }
 });
 
+// ../../node_modules/.pnpm/ansi-regex@6.0.1/node_modules/ansi-regex/index.js
+function ansiRegex({ onlyFirst = false } = {}) {
+  const pattern = [
+    "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
+    "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"
+  ].join("|");
+  return new RegExp(pattern, onlyFirst ? void 0 : "g");
+}
+var init_ansi_regex = __esm({
+  "../../node_modules/.pnpm/ansi-regex@6.0.1/node_modules/ansi-regex/index.js"() {
+    init_import_meta_url();
+    __name(ansiRegex, "ansiRegex");
+  }
+});
+
+// ../../node_modules/.pnpm/strip-ansi@7.1.0/node_modules/strip-ansi/index.js
+function stripAnsi2(string) {
+  if (typeof string !== "string") {
+    throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
+  }
+  return string.replace(regex, "");
+}
+var regex;
+var init_strip_ansi = __esm({
+  "../../node_modules/.pnpm/strip-ansi@7.1.0/node_modules/strip-ansi/index.js"() {
+    init_import_meta_url();
+    init_ansi_regex();
+    regex = ansiRegex();
+    __name(stripAnsi2, "stripAnsi");
+  }
+});
+
 // src/utils/filesystem.ts
 async function ensureDirectoryExists(filepath) {
   const dirpath = import_path6.default.dirname(filepath);
@@ -33148,7 +33210,7 @@ function getDebugFilepath() {
 async function appendToDebugLogFile(messageLevel, message) {
   const entry = `
 --- ${(/* @__PURE__ */ new Date()).toISOString()} ${messageLevel}
-${message}
+${stripAnsi2(message)}
 ---
 `;
   if (!hasLoggedLocation) {
@@ -33187,6 +33249,7 @@ var init_log_file = __esm({
     import_node_path3 = __toESM(require("path"));
     import_miniflare = require("miniflare");
     import_signal_exit = __toESM(require_signal_exit());
+    init_strip_ansi();
     init_factory();
     init_global_wrangler_config_path();
     init_logger();
@@ -33752,7 +33815,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.28.0";
+    version = "4.29.0";
   }
 });
 
@@ -34426,17 +34489,6 @@ async function ensureQueuesExist(config, queueNames) {
 async function getQueueById(config, accountId, queueId) {
   return fetchResult(config, queuesUrl(accountId, queueId), {});
 }
-async function putQueue(config, queueName, body) {
-  const queue = await getQueue(config, queueName);
-  return putQueueById(config, queue.queue_id, body);
-}
-async function putQueueById(config, queueId, body) {
-  const accountId = await requireAuth(config);
-  return fetchResult(config, queuesUrl(accountId, queueId), {
-    method: "PUT",
-    body: JSON.stringify(body)
-  });
-}
 async function postConsumer(config, queueName, body) {
   const queue = await getQueue(config, queueName);
   return postConsumerById(config, queue.queue_id, body);
@@ -34589,8 +34641,6 @@ var init_client2 = __esm({
     __name(ensureQueuesExistByConfig, "ensureQueuesExistByConfig");
     __name(ensureQueuesExist, "ensureQueuesExist");
     __name(getQueueById, "getQueueById");
-    __name(putQueue, "putQueue");
-    __name(putQueueById, "putQueueById");
     __name(postConsumer, "postConsumer");
     __name(postConsumerById, "postConsumerById");
     __name(putConsumerById, "putConsumerById");
@@ -35501,38 +35551,6 @@ var init_helpers = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/ansi-regex@6.0.1/node_modules/ansi-regex/index.js
-function ansiRegex({ onlyFirst = false } = {}) {
-  const pattern = [
-    "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
-    "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"
-  ].join("|");
-  return new RegExp(pattern, onlyFirst ? void 0 : "g");
-}
-var init_ansi_regex = __esm({
-  "../../node_modules/.pnpm/ansi-regex@6.0.1/node_modules/ansi-regex/index.js"() {
-    init_import_meta_url();
-    __name(ansiRegex, "ansiRegex");
-  }
-});
-
-// ../../node_modules/.pnpm/strip-ansi@7.1.0/node_modules/strip-ansi/index.js
-function stripAnsi2(string) {
-  if (typeof string !== "string") {
-    throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
-  }
-  return string.replace(regex, "");
-}
-var regex;
-var init_strip_ansi = __esm({
-  "../../node_modules/.pnpm/strip-ansi@7.1.0/node_modules/strip-ansi/index.js"() {
-    init_import_meta_url();
-    init_ansi_regex();
-    regex = ansiRegex();
-    __name(stripAnsi2, "stripAnsi");
-  }
-});
-
 // src/utils/print-bindings.ts
 function printBindings(bindings, tailConsumers = [], context2 = {}) {
   let hasConnectionStatus = false;
@@ -36324,7 +36342,7 @@ function unwindPropertyPath(root, path72) {
   }
   return { container, field: parts[parts.length - 1] };
 }
-var appendEnvName, isString2, isValidName, isValidDateTimeStringFormat, isStringArray, isOneOf, all, isMutuallyExclusiveWith, isBoolean, validateRequiredProperty, validateAtLeastOnePropertyRequired, validateOptionalProperty, validateTypedArray, validateOptionalTypedArray, isRequiredProperty, isOptionalProperty, hasProperty, validateAdditionalProperties, getBindingNames, isBindingList, isNamespaceList, isRecord;
+var appendEnvName, isString2, isValidName, isValidDateTimeStringFormat, isStringArray, isOneOf, all, isMutuallyExclusiveWith, isBoolean, validateRequiredProperty, validateAtLeastOnePropertyRequired, validateOptionalProperty, validateTypedArray, validateOptionalTypedArray, isRequiredProperty, isOptionalProperty, hasProperty, validateAdditionalProperties, getBindingNames, isBindingList, isNamespaceList, isRecord, validateUniqueNameProperty;
 var init_validation_helpers = __esm({
   "src/config/validation-helpers.ts"() {
     init_import_meta_url();
@@ -36565,6 +36583,23 @@ var init_validation_helpers = __esm({
       (entry) => isRecord(entry) && "binding" in entry && typeof entry.binding === "string"
     ), "isNamespaceList");
     isRecord = /* @__PURE__ */ __name((value) => typeof value === "object" && value !== null && !Array.isArray(value), "isRecord");
+    validateUniqueNameProperty = /* @__PURE__ */ __name((diagnostics, field, value) => {
+      if (Array.isArray(value)) {
+        const nameCount = /* @__PURE__ */ new Map();
+        Object.entries(value).forEach(([_4, entry]) => {
+          nameCount.set(entry.name, (nameCount.get(entry.name) ?? 0) + 1);
+        });
+        const duplicates = Array.from(nameCount.entries()).filter(([_4, count]) => count > 1).map(([name2]) => name2);
+        if (duplicates.length > 0) {
+          const list = duplicates.join('", "');
+          diagnostics.errors.push(
+            `"${field}" bindings must have unique "name" values; duplicate(s) found: "${list}"`
+          );
+          return false;
+        }
+      }
+      return true;
+    }, "validateUniqueNameProperty");
   }
 });
 
@@ -37343,7 +37378,10 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDisp
       rawEnv,
       envName,
       "workflows",
-      validateBindingArray(envName, validateWorkflowBinding),
+      all(
+        validateBindingArray(envName, validateWorkflowBinding),
+        validateUniqueNameProperty
+      ),
       []
     ),
     migrations: inheritable(
@@ -49451,14 +49489,14 @@ var init_user2 = __esm({
 });
 
 // src/cfetch/internal.ts
-async function performApiFetch(complianceConfig, resource, init3 = {}, queryParams, abortSignal) {
+async function performApiFetch(complianceConfig, resource, init3 = {}, queryParams, abortSignal, apiToken) {
   const method = init3.method ?? "GET";
   (0, import_node_assert3.default)(
     resource.startsWith("/"),
     `CF API fetch - resource path must start with a "/" but got "${resource}"`
   );
   await requireLoggedIn(complianceConfig);
-  const apiToken = requireApiToken();
+  apiToken ??= requireApiToken();
   const headers = cloneHeaders(new import_undici3.Headers(init3.headers));
   addAuthorizationHeaderIfUnspecified(headers, apiToken);
   addUserAgent(headers);
@@ -49490,14 +49528,15 @@ async function performApiFetch(complianceConfig, resource, init3 = {}, queryPara
     }
   );
 }
-async function fetchInternal(complianceConfig, resource, init3 = {}, queryParams, abortSignal) {
+async function fetchInternal(complianceConfig, resource, init3 = {}, queryParams, abortSignal, apiToken) {
   const method = init3.method ?? "GET";
   const response = await performApiFetch(
     complianceConfig,
     resource,
     init3,
     queryParams,
-    abortSignal
+    abortSignal,
+    apiToken
   );
   const jsonText = await response.text();
   logger.debug(
@@ -49668,13 +49707,14 @@ var init_internal = __esm({
 });
 
 // src/cfetch/index.ts
-async function fetchResult(complianceConfig, resource, init3 = {}, queryParams, abortSignal) {
+async function fetchResult(complianceConfig, resource, init3 = {}, queryParams, abortSignal, apiToken) {
   const json = await fetchInternal(
     complianceConfig,
     resource,
     init3,
     queryParams,
-    abortSignal
+    abortSignal,
+    apiToken
   );
   if (json.success) {
     return json.result;
@@ -58912,11 +58952,11 @@ function buildMiniflareBindingOptions(config, remoteProxyConnectionString, remot
           {
             className,
             useSQLite: classNameToUseSQLite.get(className),
-            container: getImageNameFromDOClassName({
+            container: config.containerDOClassNames?.size && config.enableContainers ? getImageNameFromDOClassName({
               doClassName: className,
               containerDOClassNames: config.containerDOClassNames,
               containerBuildId: config.containerBuildId
-            })
+            }) : void 0
           }
         ];
       }),
@@ -59093,9 +59133,6 @@ async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticati
   return { options, internalObjects, entrypointNames };
 }
 function getImageNameFromDOClassName(options) {
-  if (!options.containerDOClassNames || !options.containerDOClassNames.size) {
-    return void 0;
-  }
   (0, import_node_assert5.default)(
     options.containerBuildId,
     "Build ID should be set if containers are defined and enabled"
@@ -65731,6 +65768,199 @@ 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: "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" }
+  ];
+  if (allowSkipping) {
+    options = [{ label: "Do not set", value: "skip" }].concat(options);
+  }
+  const action = await inputPrompt({
+    question: "Which instance type should we use for your container?",
+    label: "",
+    defaultValue: false,
+    helpText: "",
+    type: "select",
+    options
+  });
+  switch (action) {
+    case "dev":
+    case "basic":
+    case "standard":
+      return action;
+    default:
+      return void 0;
+  }
+}
+function checkInstanceType(args, config) {
+  const instance_type = args.instanceType ?? config.instance_type;
+  if (instance_type === void 0) {
+    return;
+  }
+  if (args.memory !== void 0 || args.vcpu !== void 0) {
+    throw new UserError(
+      `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 UserError(
+        `"instance_type" field value is expected to be one of "dev", "basic", or "standard", but got "${instance_type}"`
+      );
+  }
+}
+function getInstanceTypeUsage(instanceType) {
+  return instanceTypes[instanceType];
+}
+function inferInstanceType(config) {
+  for (const [instanceType, configuration] of Object.entries(instanceTypes)) {
+    if (config.vcpu === configuration.vcpu && config.memory_mib === configuration.memory_mib && config.disk?.size_mb === configuration.disk_mb) {
+      return instanceType;
+    }
+  }
+}
+function cleanForInstanceType(app) {
+  if (!("configuration" in app)) {
+    return app;
+  }
+  const instance_type = inferInstanceType(app.configuration);
+  if (instance_type !== void 0) {
+    app.configuration.instance_type = instance_type;
+  }
+  delete app.configuration.disk;
+  delete app.configuration.memory;
+  delete app.configuration.memory_mib;
+  delete app.configuration.vcpu;
+  return app;
+}
+var instanceTypes;
+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
+      dev: {
+        vcpu: 0.0625,
+        memory_mib: 256,
+        disk_mb: 2e3
+      },
+      basic: {
+        vcpu: 0.25,
+        memory_mib: 1024,
+        disk_mb: 4e3
+      },
+      standard: {
+        vcpu: 0.5,
+        memory_mib: 4096,
+        disk_mb: 4e3
+      }
+    };
+    __name(promptForInstanceType, "promptForInstanceType");
+    __name(checkInstanceType, "checkInstanceType");
+    __name(getInstanceTypeUsage, "getInstanceTypeUsage");
+    __name(inferInstanceType, "inferInstanceType");
+    __name(cleanForInstanceType, "cleanForInstanceType");
+  }
+});
+
+// src/cloudchamber/limits.ts
+function configToUsage(containerConfig) {
+  if ("instance_type" in containerConfig) {
+    return getInstanceTypeUsage(containerConfig.instance_type);
+  }
+  return {
+    vcpu: containerConfig.vcpu,
+    memory_mib: containerConfig.memory_mib,
+    disk_mb: containerConfig.disk_bytes / MB
+  };
+}
+function accountToLimits(account) {
+  return {
+    vcpu: account.limits.vcpu_per_deployment,
+    memory_mib: account.limits.memory_mib_per_deployment,
+    disk_mb: account.limits.disk_mb_per_deployment
+  };
+}
+async function ensureContainerLimits(options) {
+  const limits = accountToLimits(options.account);
+  if (!options.containerConfig) {
+    await ensureImageFitsLimits({
+      availableSizeInBytes: limits.disk_mb * MB,
+      pathToDocker: options.pathToDocker,
+      imageTag: options.imageTag
+    });
+    return;
+  }
+  const usage2 = configToUsage(options.containerConfig);
+  const errors = [];
+  if (usage2.vcpu > limits.vcpu) {
+    errors.push(
+      `Your container configuration uses ${usage2.vcpu} vCPU which exceeds the account limit of ${limits.vcpu} vCPU.`
+    );
+  }
+  if (usage2.memory_mib > limits.memory_mib) {
+    errors.push(
+      `Your container configuration uses ${usage2.memory_mib} MiB of memory which exceeds the account limit of ${limits.memory_mib} MiB.`
+    );
+  }
+  if (usage2.disk_mb > limits.disk_mb) {
+    errors.push(
+      `Your container configuration uses ${usage2.disk_mb} MB of disk which exceeds the account limit of ${limits.disk_mb} MB.`
+    );
+  }
+  if (errors.length > 0) {
+    throw new UserError(`Exceeded account limits: ${errors.join(" ")}`);
+  }
+  await ensureImageFitsLimits({
+    availableSizeInBytes: usage2.disk_mb * MB,
+    pathToDocker: options.pathToDocker,
+    imageTag: options.imageTag
+  });
+}
+async function ensureImageFitsLimits(options) {
+  const inspectOutput = await dockerImageInspect(options.pathToDocker, {
+    imageTag: options.imageTag,
+    formatString: "{{ .Size }} {{ len .RootFS.Layers }}"
+  });
+  const [sizeStr, layerStr] = inspectOutput.split(" ");
+  const size = parseInt(sizeStr, 10);
+  const layers = parseInt(layerStr, 10);
+  const requiredSizeInBytes = Math.ceil(size * 1.1 + layers * 16 * MiB);
+  logger.debug(
+    `Disk size limits when building container image: availableSize=${Math.ceil(options.availableSizeInBytes / MB)}MB, requiredSize=${Math.ceil(requiredSizeInBytes / MB)}MB`
+  );
+  if (options.availableSizeInBytes < requiredSizeInBytes) {
+    throw new UserError(
+      `Image too large: needs ${Math.ceil(requiredSizeInBytes / MB)}MB, but your app is limited to images with size ${options.availableSizeInBytes / MB}MB. Your need more disk for this image.`
+    );
+  }
+}
+var MB, MiB;
+var init_limits = __esm({
+  "src/cloudchamber/limits.ts"() {
+    init_import_meta_url();
+    init_containers_shared();
+    init_errors();
+    init_logger();
+    init_instance_type();
+    MB = 1e3 * 1e3;
+    MiB = 1024 * 1024;
+    __name(configToUsage, "configToUsage");
+    __name(accountToLimits, "accountToLimits");
+    __name(ensureContainerLimits, "ensureContainerLimits");
+    __name(ensureImageFitsLimits, "ensureImageFitsLimits");
+  }
+});
+
 // src/cloudchamber/locations.ts
 async function loadAccount() {
   if (cachedAccount !== void 0) {
@@ -65804,7 +66034,7 @@ function pushYargs(yargs) {
     demandOption: false
   }).positional("TAG", { type: "string", demandOption: true });
 }
-async function buildAndMaybePush(args, pathToDocker, push, configDiskInBytes) {
+async function buildAndMaybePush(args, pathToDocker, push, containerConfig) {
   try {
     const imageTag = `${getCloudflareContainerRegistry()}/${args.tag}`;
     const { buildCmd, dockerfile } = await constructBuildCommand(
@@ -65822,35 +66052,37 @@ async function buildAndMaybePush(args, pathToDocker, push, configDiskInBytes) {
       buildCmd,
       dockerfile
     }).ready;
-    const inspectOutput = await dockerImageInspect(pathToDocker, {
-      imageTag,
-      formatString: "{{ .Size }} {{ len .RootFS.Layers }} {{json .RepoDigests}}"
-    });
-    const [sizeStr, layerStr, repoDigests] = inspectOutput.split(" ");
     let pushed = false;
     if (push) {
+      const imageInfo = await dockerImageInspect(pathToDocker, {
+        imageTag,
+        formatString: "{{ json .RepoDigests }} {{ .Id }}"
+      });
+      logger.debug(`'docker image inspect ${imageTag}':`, imageInfo);
       const account = await loadAccount();
-      const size = parseInt(sizeStr, 10);
-      const layers = parseInt(layerStr, 10);
-      const MiB = 1024 * 1024;
-      const requiredSizeInBytes = Math.ceil(size * 1.1 + layers * 16 * MiB);
-      await ensureDiskLimits({
-        requiredSizeInBytes,
+      await ensureContainerLimits({
+        pathToDocker,
+        imageTag,
         account,
-        configDiskInBytes
+        containerConfig
       });
       await dockerLoginManagedRegistry(pathToDocker);
       try {
-        const parsedDigests = JSON.parse(repoDigests);
+        const [digests, imageId] = imageInfo.split(" ");
+        const parsedDigests = JSON.parse(digests);
         if (!Array.isArray(parsedDigests)) {
           throw new Error(
             `Expected RepoDigests from docker inspect to be an array but got ${JSON.stringify(parsedDigests)}`
           );
         }
-        const repositoryOnly = imageTag.split(":")[0];
-        const [digest, ...rest] = parsedDigests.filter(
-          (d6) => typeof d6 === "string" && d6.split("@")[0] === repositoryOnly
-        );
+        const repositoryOnly = resolveImageName(
+          account.external_account_id,
+          imageTag
+        ).split(":")[0];
+        const [digest, ...rest] = parsedDigests.filter((d6) => {
+          const resolved = resolveImageName(account.external_account_id, d6);
+          return typeof d6 === "string" && resolved.split("@")[0] === repositoryOnly;
+        });
         if (rest.length > 0) {
           throw new Error(
             `Expected there to only be 1 valid digests for this repository: ${repositoryOnly} but there were ${rest.length + 1}`
@@ -65862,35 +66094,43 @@ async function buildAndMaybePush(args, pathToDocker, push, configDiskInBytes) {
           image
         );
         const remoteDigest = `${resolvedImage}@${hash}`;
-        await runDockerCmd(
-          pathToDocker,
-          ["manifest", "inspect", remoteDigest],
-          "ignore"
-        );
-        logger.log("Image already exists remotely, skipping push");
+        const remoteManifest = runDockerCmdWithOutput(pathToDocker, [
+          "manifest",
+          "inspect",
+          "-v",
+          remoteDigest
+        ]);
         logger.debug(
-          `Untagging built image: ${args.tag} since there was no change.`
+          `'docker manifest inspect -v ${remoteDigest}:`,
+          remoteManifest
         );
-        await runDockerCmd(pathToDocker, ["image", "rm", imageTag]);
-        return { image: remoteDigest, pushed: false };
+        const parsedRemoteManifest = JSON.parse(remoteManifest);
+        if (parsedRemoteManifest.Descriptor.digest === imageId) {
+          logger.log("Image already exists remotely, skipping push");
+          logger.debug(
+            `Untagging built image: ${args.tag} since there was no change.`
+          );
+          await runDockerCmd(pathToDocker, ["image", "rm", imageTag]);
+          return { image: remoteDigest, pushed: false };
+        }
       } catch (error2) {
         if (error2 instanceof Error) {
           logger.debug(
             `Checking for local image ${args.tag} failed with error: ${error2.message}`
           );
         }
-        const namespacedImageTag = getCloudflareRegistryWithAccountNamespace(
-          account.external_account_id,
-          args.tag
-        );
-        logger.log(
-          `Image does not exist remotely, pushing: ${namespacedImageTag}`
-        );
-        await runDockerCmd(pathToDocker, ["tag", imageTag, namespacedImageTag]);
-        await runDockerCmd(pathToDocker, ["push", namespacedImageTag]);
-        await runDockerCmd(pathToDocker, ["image", "rm", namespacedImageTag]);
-        pushed = true;
       }
+      const namespacedImageTag = getCloudflareRegistryWithAccountNamespace(
+        account.external_account_id,
+        args.tag
+      );
+      logger.log(
+        `Image does not exist remotely, pushing: ${namespacedImageTag}`
+      );
+      await runDockerCmd(pathToDocker, ["tag", imageTag, namespacedImageTag]);
+      await runDockerCmd(pathToDocker, ["push", namespacedImageTag]);
+      await runDockerCmd(pathToDocker, ["image", "rm", namespacedImageTag]);
+      pushed = true;
     }
     return { image: imageTag, pushed };
   } catch (error2) {
@@ -65922,8 +66162,8 @@ async function buildCommand(args) {
     },
     getDockerPath() ?? args.pathToDocker,
     args.push,
-    // this means we won't be able to read the disk size from the config, but that option is deprecated anyway at least for containers.
-    // and this never actually worked for cloudchamber as this command was previously reading it from config.containers not config.cloudchamber
+    // this means we aren't validating defined limits for a container when building an image
+    // we will, however, still validate the image size against account level disk limits
     void 0
   );
 }
@@ -65958,24 +66198,6 @@ async function checkImagePlatform(pathToDocker, imageTag, expectedPlatform = "li
     );
   }
 }
-async function ensureDiskLimits(options) {
-  const MB = 1e3 * 1e3;
-  const accountDiskSizeInBytes = (options.account.limits.disk_mb_per_deployment ?? 2e3) * MB;
-  if (options.configDiskInBytes && options.configDiskInBytes > accountDiskSizeInBytes) {
-    throw new UserError(
-      `Exceeded account limits: Your container is configured to use a disk size of ${Math.ceil(options.configDiskInBytes / MB)}MB. However, that exceeds the account limit of ${accountDiskSizeInBytes / MB}MB`
-    );
-  }
-  const maxAllowedImageSizeBytes = options.configDiskInBytes ?? accountDiskSizeInBytes;
-  logger.debug(
-    `Disk size limits when building the container: appDiskSize: ${options.configDiskInBytes ? Math.ceil(options.configDiskInBytes / MB) : "n/a"}MB, accountDiskSize:${accountDiskSizeInBytes / MB}MB, maxAllowedImageSizeBytes=${maxAllowedImageSizeBytes}(${maxAllowedImageSizeBytes / MB}MB), requiredSize=${options.requiredSizeInBytes}(${Math.ceil(options.requiredSizeInBytes / MB)}MB)`
-  );
-  if (maxAllowedImageSizeBytes < options.requiredSizeInBytes) {
-    throw new UserError(
-      `Image too large: needs ${Math.ceil(options.requiredSizeInBytes / MB)}MB, but your app is limited to images with size ${maxAllowedImageSizeBytes / MB}MB. Your account needs more disk size per instance to run this container. The default disk size is 2GB.`
-    );
-  }
-}
 var import_fs13, import_path10;
 var init_build2 = __esm({
   "src/cloudchamber/build.ts"() {
@@ -65987,6 +66209,7 @@ var init_build2 = __esm({
     init_errors();
     init_logger();
     init_user2();
+    init_limits();
     init_locations();
     __name(buildYargs, "buildYargs");
     __name(pushYargs, "pushYargs");
@@ -65994,7 +66217,6 @@ var init_build2 = __esm({
     __name(buildCommand, "buildCommand");
     __name(pushCommand, "pushCommand");
     __name(checkImagePlatform, "checkImagePlatform");
-    __name(ensureDiskLimits, "ensureDiskLimits");
   }
 });
 
@@ -66748,6 +66970,7 @@ async function fillOpenAPIConfiguration(config, scope) {
     ...OpenAPI.HEADERS ?? {},
     ...Object.fromEntries(headers.entries())
   };
+  OpenAPI.LOGGER = logger;
 }
 function checkEverythingIsSet(object, keys) {
   keys.forEach((key) => {
@@ -66995,90 +67218,14 @@ async function promptForLabels(labels, initiallySelected, allowSkipping) {
   }
   return [];
 }
-async function promptForInstanceType(allowSkipping) {
-  let options = [
-    { label: "dev: 1/16 vCPU, 256 MiB memory, 2 GB disk", value: "dev" },
-    { 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" }
-  ];
-  if (allowSkipping) {
-    options = [{ label: "Do not set", value: "skip" }].concat(options);
-  }
-  const action = await inputPrompt({
-    question: "Which instance type should we use for your container?",
-    label: "",
-    defaultValue: false,
-    helpText: "",
-    type: "select",
-    options
-  });
-  switch (action) {
-    case "dev":
-      return "dev" /* DEV */;
-    case "basic":
-      return "basic" /* BASIC */;
-    case "standard":
-      return "standard" /* STANDARD */;
-    default:
-      return void 0;
-  }
-}
 function resolveMemory(args, config) {
-  const MiB = 1024 * 1024;
+  const MiB2 = 1024 * 1024;
   const memory = args.memory ?? config.memory;
   if (memory !== void 0) {
-    return Math.round(parseByteSize(memory, 1024) / MiB);
+    return Math.round(parseByteSize(memory, 1024) / MiB2);
   }
   return void 0;
 }
-function checkInstanceType(args, config) {
-  const instance_type = args.instanceType ?? config.instance_type;
-  if (instance_type === void 0) {
-    return;
-  }
-  if (args.memory !== void 0 || args.vcpu !== void 0) {
-    throw new UserError(
-      `Field "instance_type" is mutually exclusive with "memory" and "vcpu". These fields cannot be set together.`
-    );
-  }
-  switch (instance_type) {
-    case "dev":
-      return "dev" /* DEV */;
-    case "basic":
-      return "basic" /* BASIC */;
-    case "standard":
-      return "standard" /* STANDARD */;
-    default:
-      throw new UserError(
-        `"instance_type" field value is expected to be one of "dev", "basic", or "standard", but got "${instance_type}"`
-      );
-  }
-}
-function inferInstanceType(configuration) {
-  if (configuration?.disk?.size_mb !== void 0 && configuration?.memory_mib !== void 0 && configuration?.vcpu !== void 0) {
-    if (configuration.disk.size_mb === 2e3 && configuration.memory_mib === 256 && configuration.vcpu === 0.0625) {
-      return "dev" /* DEV */;
-    } else if (configuration.disk.size_mb === 4e3 && configuration.memory_mib === 1024 && configuration.vcpu === 0.25) {
-      return "basic" /* BASIC */;
-    } else if (configuration.disk.size_mb === 4e3 && configuration.memory_mib === 4096 && configuration.vcpu === 0.5) {
-      return "standard" /* STANDARD */;
-    }
-  }
-}
-function cleanForInstanceType(app) {
-  if (!("configuration" in app)) {
-    return app;
-  }
-  const instance_type = inferInstanceType(app.configuration);
-  if (instance_type !== void 0) {
-    app.configuration.instance_type = instance_type;
-  }
-  delete app.configuration.disk;
-  delete app.configuration.memory;
-  delete app.configuration.memory_mib;
-  delete app.configuration.vcpu;
-  return app;
-}
 var cloudchamberScope, imageRe;
 var init_common = __esm({
   "src/cloudchamber/common.ts"() {
@@ -67125,11 +67272,7 @@ var init_common = __esm({
     __name(sortLabels, "sortLabels");
     __name(collectLabels, "collectLabels");
     __name(promptForLabels, "promptForLabels");
-    __name(promptForInstanceType, "promptForInstanceType");
     __name(resolveMemory, "resolveMemory");
-    __name(checkInstanceType, "checkInstanceType");
-    __name(inferInstanceType, "inferInstanceType");
-    __name(cleanForInstanceType, "cleanForInstanceType");
   }
 });
 
@@ -67359,13 +67502,15 @@ var init_args = __esm({
 function deleteYargs(args) {
   return args.positional("ID", {
     describe: "id of the containers to delete",
-    type: "string"
+    type: "string",
+    demandOption: true
   });
 }
 async function deleteCommand(deleteArgs, _config) {
-  if (!deleteArgs.ID) {
-    throw new Error(
-      "You must provide an ID. Use 'wrangler containers list` to view your containers."
+  const uuidRegex2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  if (!uuidRegex2.test(deleteArgs.ID)) {
+    throw new UserError(
+      `Expected a container ID but got ${deleteArgs.ID}. Use \`wrangler containers list\` to view your containers and corresponding IDs.`
     );
   }
   startSection("Delete your container");
@@ -68158,6 +68303,7 @@ var init_deploy = __esm({
     init_containers_shared();
     init_common();
     init_diff();
+    init_instance_type();
     init_config2();
     init_errors();
     init_user2();
@@ -68268,9 +68414,12 @@ ${err.message}`
             );
           }
         }
-        success(`Modified application ${brandColor(action.name)}`, {
-          shape: shapes.bar
-        });
+        success(
+          `Modified application ${brandColor(action.name)} (Application ID: ${action.id})`,
+          {
+            shape: shapes.bar
+          }
+        );
       }
     }, "doAction");
     __name(cleanApplicationFromAPI, "cleanApplicationFromAPI");
@@ -68411,7 +68560,7 @@ async function maybeBuildContainer(containerConfig, imageTag, dryRun, pathToDock
     },
     pathToDocker,
     !dryRun,
-    "disk_bytes" in containerConfig ? containerConfig.disk_bytes : void 0
+    containerConfig
   );
   if (buildResult.pushed) {
     return { newImageLink: buildResult.image };
@@ -68509,7 +68658,10 @@ var init_config3 = __esm({
           max_instances: container.max_instances ?? 0,
           scheduling_policy: container.scheduling_policy ?? "default" /* DEFAULT */,
           constraints: {
-            tier: container.constraints?.tier ?? 1,
+            // if the tier is -1, then we allow all tiers
+            // Wrangler will default an input value to 1. The API, however, will
+            // treat an undefined value to mean no constraints on tier (i.e. "all tiers")
+            tier: container.constraints?.tier === -1 ? void 0 : container.constraints?.tier ?? 1,
             regions: container.constraints?.regions?.map(
               (region) => region.toUpperCase()
             ),
@@ -68524,10 +68676,10 @@ var init_config3 = __esm({
           }
         };
         let instanceTypeOrLimits;
-        const MB = 1e3 * 1e3;
+        const MB2 = 1e3 * 1e3;
         if (container.configuration?.disk !== void 0 || container.configuration?.vcpu !== void 0 || container.configuration?.memory_mib !== void 0) {
           instanceTypeOrLimits = {
-            disk_bytes: (container.configuration?.disk?.size_mb ?? 2e3) * MB,
+            disk_bytes: (container.configuration?.disk?.size_mb ?? 2e3) * MB2,
             // defaults to 2GB in bytes
             vcpu: container.configuration?.vcpu ?? 0.0625,
             memory_mib: container.configuration?.memory_mib ?? 256
@@ -68538,7 +68690,7 @@ var init_config3 = __esm({
           };
         } else {
           instanceTypeOrLimits = {
-            disk_bytes: (container.instance_type.disk_mb ?? 2e3) * MB,
+            disk_bytes: (container.instance_type.disk_mb ?? 2e3) * MB2,
             vcpu: container.instance_type.vcpu ?? 0.0625,
             memory_mib: container.instance_type.memory_mib ?? 256
           };
@@ -71886,8 +72038,11 @@ ${dashLink}`);
     );
   }
   if (config.queues.producers && config.queues.producers.length) {
-    const updateProducers = await updateQueueProducers(config);
-    deployments.push(...updateProducers);
+    deployments.push(
+      ...config.queues.producers.map(
+        (producer) => Promise.resolve([`Producer for ${producer.queue}`])
+      )
+    );
   }
   if (config.queues.consumers && config.queues.consumers.length) {
     const updateConsumers = await updateQueueConsumers(scriptName, config);
@@ -74332,7 +74487,7 @@ var require_websocket2 = __commonJS({
     var http5 = require("http");
     var net2 = require("net");
     var tls = require("tls");
-    var { randomBytes: randomBytes2, createHash: createHash7 } = require("crypto");
+    var { randomBytes: randomBytes2, createHash: createHash8 } = require("crypto");
     var { Duplex: Duplex2, Readable: Readable8 } = require("stream");
     var { URL: URL7 } = require("url");
     var PerMessageDeflate = require_permessage_deflate2();
@@ -74992,7 +75147,7 @@ var require_websocket2 = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash7("sha1").update(key + GUID).digest("base64");
+        const digest = createHash8("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -75284,7 +75439,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter5 = require("events");
     var http5 = require("http");
     var { Duplex: Duplex2 } = require("stream");
-    var { createHash: createHash7 } = require("crypto");
+    var { createHash: createHash8 } = require("crypto");
     var extension = require_extension();
     var PerMessageDeflate = require_permessage_deflate2();
     var subprotocol = require_subprotocol();
@@ -75582,7 +75737,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash7("sha1").update(key + GUID).digest("base64");
+        const digest = createHash8("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -79384,13 +79539,14 @@ var init_build3 = __esm({
         provideConfig: false
       },
       async handler(buildArgs) {
-        await createCLIParser([
+        const { wrangler } = createCLIParser([
           "deploy",
           "--dry-run",
           "--outdir=dist",
           ...buildArgs.env ? ["--env", buildArgs.env] : [],
           ...buildArgs.config ? ["--config", buildArgs.config] : []
-        ]).parse();
+        ]);
+        await wrangler.parse();
       }
     });
   }
@@ -80112,6 +80268,7 @@ var init_apply = __esm({
     init_sortObjectRecursive();
     init_common();
     init_diff();
+    init_instance_type();
     __name(mergeDeep3, "mergeDeep");
     __name(isObject2, "isObject");
     __name(applyCommandOptionalYargs, "applyCommandOptionalYargs");
@@ -81202,6 +81359,7 @@ var init_create2 = __esm({
     init_locations2();
     init_common();
     init_wrap();
+    init_instance_type();
     init_locations();
     init_network();
     init_ssh();
@@ -82204,6 +82362,7 @@ var init_modify = __esm({
     init_locations2();
     init_common();
     init_wrap();
+    init_instance_type();
     init_locations();
     init_ssh();
     __name(modifyCommandOptionalYargs, "modifyCommandOptionalYargs");
@@ -85307,7 +85466,7 @@ async function guessWorkerFormat(entryFile, entryWorkingDirectory, tsconfig) {
       `The entrypoint ${import_node_path28.default.relative(
         process.cwd(),
         entryFile
-      )} defines a Python worker, support for Python workers is currently experimental. Python workers with a cf-requirements.txt file can only be run locally and cannot be deployed.`
+      )} defines a Python worker, support for Python workers is currently experimental.`
     );
     return { format: "modules", exports: [] };
   }
@@ -85897,6 +86056,13 @@ var init_deploy4 = __esm({
           requiresArg: true,
           array: true
         },
+        domains: {
+          describe: "Custom domains to deploy to",
+          alias: "domain",
+          type: "string",
+          requiresArg: true,
+          array: true
+        },
         "jsx-factory": {
           describe: "The function that is called for each JSX element",
           type: "string",
@@ -86067,6 +86233,7 @@ var init_deploy4 = __esm({
           jsxFragment: args.jsxFragment,
           tsconfig: args.tsconfig,
           routes: args.routes,
+          domains: args.domains,
           assetsOptions,
           legacyAssetPaths: siteAssetPaths,
           legacyEnv: isLegacyEnv(config),
@@ -95462,9 +95629,14 @@ var init_deployments2 = __esm({
           type: "string",
           choices: ["production", "preview"],
           description: "Environment type to list deployments for"
+        },
+        json: {
+          type: "boolean",
+          description: "Return output as clean JSON",
+          default: false
         }
       },
-      async handler({ projectName, environment }) {
+      async handler({ projectName, environment, json }) {
         const config = getConfigCache(
           PAGES_CONFIG_CACHE_FILENAME
         );
@@ -95506,7 +95678,11 @@ var init_deployments2 = __esm({
         saveToConfigCache(PAGES_CONFIG_CACHE_FILENAME, {
           account_id: accountId
         });
-        logger.table(data);
+        if (json) {
+          logger.log(JSON.stringify(data, null, 2));
+        } else {
+          logger.table(data);
+        }
         sendMetricsEvent("list pages deployments");
       }
     });
@@ -151641,6 +151817,31 @@ Changes to triggers (routes, custom domains, cron schedules, etc) must be applie
 function formatTime3(duration) {
   return `(${(duration / 1e3).toFixed(2)} sec)`;
 }
+function sanitizeBranchName(branchName) {
+  return branchName.replace(/[^a-zA-Z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-+|-+$/g, "").toLowerCase();
+}
+function getBranchName() {
+  const ciBranchName = getWorkersCIBranchName();
+  if (ciBranchName) {
+    return ciBranchName;
+  }
+  try {
+    (0, import_node_child_process7.execSync)(`git rev-parse --is-inside-work-tree`, { stdio: "ignore" });
+    return (0, import_node_child_process7.execSync)(`git rev-parse --abbrev-ref HEAD`).toString().trim();
+  } catch {
+    return void 0;
+  }
+}
+function createTruncatedAlias(branchName, sanitizedAlias, availableSpace) {
+  const spaceForHash = HASH_LENGTH + 1;
+  const maxPrefixLength = availableSpace - spaceForHash;
+  if (maxPrefixLength < 1) {
+    return void 0;
+  }
+  const hash = (0, import_node_crypto12.createHash)("sha256").update(branchName).digest("hex").slice(0, HASH_LENGTH);
+  const truncatedPrefix = sanitizedAlias.slice(0, maxPrefixLength);
+  return `${truncatedPrefix}-${hash}`;
+}
 function generatePreviewAlias(scriptName) {
   const warnAndExit = /* @__PURE__ */ __name(() => {
     logger.warn(
@@ -151648,38 +151849,32 @@ function generatePreviewAlias(scriptName) {
     );
     return void 0;
   }, "warnAndExit");
-  let branchName = getWorkersCIBranchName();
-  if (!branchName) {
-    try {
-      (0, import_node_child_process7.execSync)(`git rev-parse --is-inside-work-tree`, { stdio: "ignore" });
-      branchName = (0, import_node_child_process7.execSync)(`git rev-parse --abbrev-ref HEAD`).toString().trim();
-    } catch {
-      return warnAndExit();
-    }
-  }
+  const branchName = getBranchName();
   if (!branchName) {
     return warnAndExit();
   }
-  const sanitizedAlias = branchName.replace(/[^a-zA-Z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-+|-+$/g, "").toLowerCase();
-  const isValidAlias = /^[a-z](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(
-    sanitizedAlias
-  );
-  if (!isValidAlias) {
+  const sanitizedAlias = sanitizeBranchName(branchName);
+  if (!ALIAS_VALIDATION_REGEX.test(sanitizedAlias)) {
     return warnAndExit();
   }
-  const maxDnsLabelLength = 63;
-  const available = maxDnsLabelLength - scriptName.length - 1;
-  if (sanitizedAlias.length > available) {
-    return warnAndExit();
+  const availableSpace = MAX_DNS_LABEL_LENGTH - scriptName.length - 1;
+  if (sanitizedAlias.length <= availableSpace) {
+    return sanitizedAlias;
   }
-  return sanitizedAlias;
+  const truncatedAlias = createTruncatedAlias(
+    branchName,
+    sanitizedAlias,
+    availableSpace
+  );
+  return truncatedAlias || warnAndExit();
 }
-var import_node_assert24, import_node_child_process7, import_node_fs32, import_node_path54, import_undici19, versionsUploadCommand;
+var import_node_assert24, import_node_child_process7, import_node_crypto12, import_node_fs32, import_node_path54, import_undici19, versionsUploadCommand, MAX_DNS_LABEL_LENGTH, HASH_LENGTH, ALIAS_VALIDATION_REGEX;
 var init_upload2 = __esm({
   "src/versions/upload.ts"() {
     init_import_meta_url();
     import_node_assert24 = __toESM(require("assert"));
     import_node_child_process7 = require("child_process");
+    import_node_crypto12 = require("crypto");
     import_node_fs32 = require("fs");
     import_node_path54 = __toESM(require("path"));
     init_colors();
@@ -152001,6 +152196,12 @@ var init_upload2 = __esm({
     });
     __name(versionsUpload, "versionsUpload");
     __name(formatTime3, "formatTime");
+    MAX_DNS_LABEL_LENGTH = 63;
+    HASH_LENGTH = 4;
+    ALIAS_VALIDATION_REGEX = /^[a-z](?:[a-z0-9-]{0,61}[a-z0-9])?$/;
+    __name(sanitizeBranchName, "sanitizeBranchName");
+    __name(getBranchName, "getBranchName");
+    __name(createTruncatedAlias, "createTruncatedAlias");
     __name(generatePreviewAlias, "generatePreviewAlias");
   }
 });
@@ -156874,13 +157075,13 @@ function createCLIParser(argv) {
   wrangler.version(false);
   registry.registerAll();
   wrangler.exitProcess(false);
-  return wrangler;
+  return { wrangler, registry };
 }
 async function main(argv) {
   setupSentry();
   checkMacOSVersion({ shouldThrow: false });
   const startTime = Date.now();
-  const wrangler = createCLIParser(argv);
+  const { wrangler } = createCLIParser(argv);
   let command2;
   let metricsArgs;
   let dispatcher;
@@ -156942,7 +157143,8 @@ async function main(argv) {
     logger.log("");
     if (e7 instanceof CommandLineArgsError) {
       logger.error(e7.message);
-      await createCLIParser([...argv, "--help"]).parse();
+      const { wrangler: helpWrangler } = createCLIParser([...argv, "--help"]);
+      await helpWrangler.parse();
     } else if (isAuthenticationError(e7) || // Is this a Containers/Cloudchamber-based auth error?
     // This is different because it uses a custom OpenAPI-based generated client
     e7 instanceof UserError && e7.cause instanceof ApiError && e7.cause.status === 403) {
@@ -157253,20 +157455,23 @@ async function checkStartupHandler({
       logger.loggerLevel = "error";
     }
     await spinnerWhile({
-      promise: /* @__PURE__ */ __name(async () => await createCLIParser(
-        config.pages_build_output_dir || pages ? [
-          "pages",
-          "functions",
-          "build",
-          ...args?.split(" ") ?? [],
-          `--outfile=${workerBundle}`
-        ] : [
-          "deploy",
-          ...args?.split(" ") ?? [],
-          "--dry-run",
-          `--outfile=${workerBundle}`
-        ]
-      ).parse(), "promise"),
+      promise: /* @__PURE__ */ __name(async () => {
+        const { wrangler } = createCLIParser(
+          config.pages_build_output_dir || pages ? [
+            "pages",
+            "functions",
+            "build",
+            ...args?.split(" ") ?? [],
+            `--outfile=${workerBundle}`
+          ] : [
+            "deploy",
+            ...args?.split(" ") ?? [],
+            "--dry-run",
+            `--outfile=${workerBundle}`
+          ]
+        );
+        await wrangler.parse();
+      }, "promise"),
       startMessage: "Building your Worker",
       endMessage: source_default.green("Worker Built! \u{1F389}")
     });
@@ -157725,8 +157930,13 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       { telemetryMessage: "missing compatibility date when deploying" }
     );
   }
+  const domainRoutes = (props.domains || []).map((domain2) => ({
+    pattern: domain2,
+    custom_domain: true
+  }));
   const routes = props.routes ?? config.routes ?? (config.route ? [config.route] : []) ?? [];
-  validateRoutes3(routes, props.assetsOptions);
+  const allRoutes = [...routes, ...domainRoutes];
+  validateRoutes3(allRoutes, props.assetsOptions);
   const jsxFactory = props.jsxFactory || config.jsx_factory;
   const jsxFragment = props.jsxFragment || config.jsx_fragment;
   const keepVars = props.keepVars || config.keep_vars;
@@ -158191,7 +158401,10 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       dryRun: props.dryRun ?? false
     });
   }
-  const targets = await triggersDeploy(props);
+  const targets = await triggersDeploy({
+    ...props,
+    routes: allRoutes
+  });
   logger.log("Current Version ID:", versionId);
   return {
     sourceMapSize,
@@ -158341,24 +158554,6 @@ async function publishRoutesFallback(complianceConfig, routes, {
 function isAuthenticationError(e7) {
   return e7 instanceof ParseError && e7.code === 1e4;
 }
-async function updateQueueProducers(config) {
-  const producers = config.queues.producers || [];
-  const updateProducers = [];
-  for (const producer of producers) {
-    const body = {
-      queue_name: producer.queue,
-      settings: {
-        delivery_delay: producer.delivery_delay
-      }
-    };
-    updateProducers.push(
-      putQueue(config, producer.queue, body).then(() => [
-        `Producer for ${producer.queue}`
-      ])
-    );
-  }
-  return updateProducers;
-}
 async function updateQueueConsumers(scriptName, config) {
   const consumers = config.queues.consumers || [];
   const updateConsumers = [];
@@ -158539,7 +158734,6 @@ ${mountedAssetRoutes.map((route) => {
     __name(publishRoutes, "publishRoutes");
     __name(publishRoutesFallback, "publishRoutesFallback");
     __name(isAuthenticationError, "isAuthenticationError");
-    __name(updateQueueProducers, "updateQueueProducers");
     __name(updateQueueConsumers, "updateQueueConsumers");
   }
 });
@@ -178105,12 +178299,12 @@ function didMiniflareOptionsChange(prev, next) {
   }
   return !deepEquality(prev, next);
 }
-var import_node_assert30, import_node_crypto12, import_node_events4, import_node_path62, import_miniflare23, ProxyController, ProxyControllerLogger;
+var import_node_assert30, import_node_crypto13, import_node_events4, import_node_path62, import_miniflare23, ProxyController, ProxyControllerLogger;
 var init_ProxyController = __esm({
   "src/api/startDevWorker/ProxyController.ts"() {
     init_import_meta_url();
     import_node_assert30 = __toESM(require("assert"));
-    import_node_crypto12 = require("crypto");
+    import_node_crypto13 = require("crypto");
     import_node_events4 = __toESM(require("events"));
     import_node_path62 = __toESM(require("path"));
     import_miniflare23 = require("miniflare");
@@ -178137,7 +178331,7 @@ var init_ProxyController = __esm({
       inspectorProxyWorkerWebSocket;
       latestConfig;
       latestBundle;
-      secret = (0, import_node_crypto12.randomUUID)();
+      secret = (0, import_node_crypto13.randomUUID)();
       createProxyWorker() {
         if (this._torndown) {
           return;
@@ -178607,14 +178801,15 @@ function switchHost(originalUrl, host, zonePreview) {
   return url4;
 }
 async function createPreviewSession(complianceConfig, account, ctx, abortSignal) {
-  const { accountId } = account;
+  const { accountId, apiToken } = account;
   const initUrl = ctx.zone ? `/zones/${ctx.zone}/workers/edge-preview` : `/accounts/${accountId}/workers/subdomain/edge-preview`;
   const { exchange_url } = await fetchResult(
     complianceConfig,
     initUrl,
     void 0,
     void 0,
-    abortSignal
+    abortSignal,
+    apiToken
   );
   const switchedExchangeUrl = switchHost(
     exchange_url,
@@ -178643,7 +178838,7 @@ async function createPreviewSession(complianceConfig, account, ctx, abortSignal)
     const inspector = new import_node_url12.URL(inspector_websocket);
     inspector.searchParams.append("cf_workers_preview_token", token);
     return {
-      id: import_node_crypto13.default.randomUUID(),
+      id: import_node_crypto14.default.randomUUID(),
       value: token,
       host: ctx.host ?? inspector.host,
       inspectorUrl: switchHost(inspector.href, ctx.host, !!ctx.zone),
@@ -178736,11 +178931,11 @@ async function createWorkerPreview(complianceConfig, init3, account, ctx, sessio
   );
   return token;
 }
-var import_node_crypto13, import_node_url12, import_undici23;
+var import_node_crypto14, import_node_url12, import_undici23;
 var init_create_worker_preview = __esm({
   "src/dev/create-worker-preview.ts"() {
     init_import_meta_url();
-    import_node_crypto13 = __toESM(require("crypto"));
+    import_node_crypto14 = __toESM(require("crypto"));
     import_node_url12 = require("url");
     import_undici23 = __toESM(require_undici());
     init_cfetch();
@@ -178881,7 +179076,7 @@ async function createRemoteWorkerInit(props) {
 async function getWorkerAccountAndContext(props) {
   const workerAccount = {
     accountId: props.accountId,
-    apiToken: requireApiToken()
+    apiToken: props.apiToken ?? requireApiToken()
   };
   const zoneId = await getZoneIdForPreview(props.complianceConfig, {
     host: props.host,
@@ -179113,6 +179308,7 @@ var init_RemoteRuntimeController = __esm({
           this.#session ??= await this.#previewSession({
             complianceConfig: { compliance_region: config.complianceRegion },
             accountId: auth.accountId,
+            apiToken: auth.apiToken,
             env: config.env,
             // deprecated service environments -- just pass it through for now
             legacyEnv: !config.legacy?.enableServiceEnvironments,
@@ -179503,34 +179699,54 @@ function pickRemoteBindings(bindings) {
     })
   );
 }
-async function maybeStartOrUpdateRemoteProxySession(configPathOrWorkerConfig, preExistingRemoteProxySessionData) {
-  if (typeof configPathOrWorkerConfig === "string") {
-    const configPath = configPathOrWorkerConfig;
-    const config = readConfig({ config: configPath });
+async function maybeStartOrUpdateRemoteProxySession(wranglerOrWorkerConfigObject, preExistingRemoteProxySessionData, auth) {
+  let config;
+  if ("path" in wranglerOrWorkerConfigObject) {
+    const wranglerConfigObject = wranglerOrWorkerConfigObject;
+    config = readConfig({
+      config: wranglerConfigObject.path,
+      env: wranglerConfigObject.environment
+    });
     (0, import_node_assert33.default)(config.name);
-    configPathOrWorkerConfig = {
+    wranglerOrWorkerConfigObject = {
       name: config.name,
       complianceRegion: getCloudflareComplianceRegion(config),
       bindings: convertConfigBindingsToStartWorkerBindings(config) ?? {}
     };
   }
-  const workerConfigs = configPathOrWorkerConfig;
-  const remoteBindings = pickRemoteBindings(workerConfigs.bindings);
-  let remoteProxySession = preExistingRemoteProxySessionData?.session;
-  const remoteBindingsAreSameAsBefore = deepStrictEqual(
-    remoteBindings,
-    preExistingRemoteProxySessionData?.remoteBindings
+  const workerConfigObject = wranglerOrWorkerConfigObject;
+  const remoteBindings = pickRemoteBindings(workerConfigObject.bindings);
+  const authSameAsBefore = deepStrictEqual(
+    auth,
+    preExistingRemoteProxySessionData?.auth
   );
-  if (!remoteBindingsAreSameAsBefore) {
-    if (!remoteProxySession) {
-      if (Object.keys(remoteBindings).length > 0) {
-        remoteProxySession = await startRemoteProxySession(remoteBindings, {
-          workerName: configPathOrWorkerConfig.name,
-          complianceRegion: configPathOrWorkerConfig.complianceRegion
-        });
+  let remoteProxySession = preExistingRemoteProxySessionData?.session;
+  if (!authSameAsBefore) {
+    if (preExistingRemoteProxySessionData?.session) {
+      await preExistingRemoteProxySessionData.session.dispose();
+    }
+    remoteProxySession = await startRemoteProxySession(remoteBindings, {
+      workerName: workerConfigObject.name,
+      complianceRegion: workerConfigObject.complianceRegion,
+      auth: getAuthHook(auth, config)
+    });
+  } else {
+    const remoteBindingsAreSameAsBefore = deepStrictEqual(
+      remoteBindings,
+      preExistingRemoteProxySessionData?.remoteBindings
+    );
+    if (!remoteBindingsAreSameAsBefore) {
+      if (!remoteProxySession) {
+        if (Object.keys(remoteBindings).length > 0) {
+          remoteProxySession = await startRemoteProxySession(remoteBindings, {
+            workerName: workerConfigObject.name,
+            complianceRegion: workerConfigObject.complianceRegion,
+            auth: getAuthHook(auth, config)
+          });
+        }
+      } else {
+        await remoteProxySession.updateBindings(remoteBindings);
       }
-    } else {
-      await remoteProxySession.updateBindings(remoteBindings);
     }
   }
   await remoteProxySession?.ready;
@@ -179542,6 +179758,20 @@ async function maybeStartOrUpdateRemoteProxySession(configPathOrWorkerConfig, pr
     remoteBindings
   };
 }
+function getAuthHook(auth, config) {
+  if (auth) {
+    return auth;
+  }
+  if (config?.account_id) {
+    return async () => {
+      return {
+        accountId: await requireAuth(config),
+        apiToken: requireApiToken()
+      };
+    };
+  }
+  return void 0;
+}
 function deepStrictEqual(source, target) {
   try {
     import_node_assert33.default.deepStrictEqual(source, target);
@@ -179560,10 +179790,12 @@ var init_remoteBindings = __esm({
     init_config2();
     init_misc_variables();
     init_paths();
+    init_user2();
     init_startDevWorker();
     __name(startRemoteProxySession, "startRemoteProxySession");
     __name(pickRemoteBindings, "pickRemoteBindings");
     __name(maybeStartOrUpdateRemoteProxySession, "maybeStartOrUpdateRemoteProxySession");
+    __name(getAuthHook, "getAuthHook");
     __name(deepStrictEqual, "deepStrictEqual");
   }
 });
@@ -179674,7 +179906,8 @@ async function convertToConfigBundle(event) {
       event.config.containers?.map((c6) => c6.class_name)
     ),
     containerBuildId: event.config.dev?.containerBuildId,
-    containerEngine: event.config.dev.containerEngine
+    containerEngine: event.config.dev.containerEngine,
+    enableContainers: event.config.dev.enableContainers ?? true
   };
 }
 async function getContainerDevOptions(containersConfig, containerBuildId) {
@@ -179704,12 +179937,12 @@ async function getContainerDevOptions(containersConfig, containerBuildId) {
   }
   return containers2;
 }
-var import_node_assert34, import_node_crypto14, import_promises36, import_miniflare26, LocalRuntimeController;
+var import_node_assert34, import_node_crypto15, import_promises36, import_miniflare26, LocalRuntimeController;
 var init_LocalRuntimeController = __esm({
   "src/api/startDevWorker/LocalRuntimeController.ts"() {
     init_import_meta_url();
     import_node_assert34 = __toESM(require("assert"));
-    import_node_crypto14 = require("crypto");
+    import_node_crypto15 = require("crypto");
     import_promises36 = require("fs/promises");
     init_containers_shared();
     init_source();
@@ -179736,7 +179969,7 @@ var init_LocalRuntimeController = __esm({
       // This is given as a shared secret to the Proxy and User workers
       // so that the User Worker can trust aspects of HTTP requests from the Proxy Worker
       // if it provides the secret in a `MF-Proxy-Shared-Secret` header.
-      #proxyToUserWorkerAuthenticationSecret = (0, import_node_crypto14.randomUUID)();
+      #proxyToUserWorkerAuthenticationSecret = (0, import_node_crypto15.randomUUID)();
       // `buildMiniflareOptions()` is asynchronous, meaning if multiple bundle
       // updates were submitted, the second may apply before the first. Therefore,
       // wrap updates in a mutex, so they're always applied in invocation order.
@@ -179764,14 +179997,22 @@ var init_LocalRuntimeController = __esm({
           const configBundle = await convertToConfigBundle(data);
           const experimentalRemoteBindings = data.config.dev.experimentalRemoteBindings ?? false;
           if (experimentalRemoteBindings && !data.config.dev?.remote) {
-            const { maybeStartOrUpdateRemoteProxySession: maybeStartOrUpdateRemoteProxySession2 } = await Promise.resolve().then(() => (init_remoteBindings(), remoteBindings_exports));
+            const { maybeStartOrUpdateRemoteProxySession: maybeStartOrUpdateRemoteProxySession2, pickRemoteBindings: pickRemoteBindings2 } = await Promise.resolve().then(() => (init_remoteBindings(), remoteBindings_exports));
+            const remoteBindings = pickRemoteBindings2(
+              convertCfWorkerInitBindingsToBindings(configBundle.bindings) ?? {}
+            );
+            const auth = Object.keys(remoteBindings).length === 0 ? (
+              // If there are no remote bindings (this is a local only session) there's no need to get auth data
+              void 0
+            ) : await unwrapHook(data.config.dev.auth);
             this.#remoteProxySessionData = await maybeStartOrUpdateRemoteProxySession2(
               {
                 name: configBundle.name,
                 complianceRegion: configBundle.complianceRegion,
-                bindings: convertCfWorkerInitBindingsToBindings(configBundle.bindings) ?? {}
+                bindings: remoteBindings
               },
-              this.#remoteProxySessionData ?? null
+              this.#remoteProxySessionData ?? null,
+              auth
             );
           }
           if (data.config.containers?.length && data.config.dev.enableContainers && this.#currentContainerBuildId !== data.config.dev.containerBuildId) {
@@ -179958,12 +180199,12 @@ function ensureMatchingSql(options) {
   }
   return options;
 }
-var import_node_assert35, import_node_crypto15, import_miniflare27, MultiworkerRuntimeController;
+var import_node_assert35, import_node_crypto16, import_miniflare27, MultiworkerRuntimeController;
 var init_MultiworkerRuntimeController = __esm({
   "src/api/startDevWorker/MultiworkerRuntimeController.ts"() {
     init_import_meta_url();
     import_node_assert35 = __toESM(require("assert"));
-    import_node_crypto15 = require("crypto");
+    import_node_crypto16 = require("crypto");
     init_containers_shared();
     init_source();
     import_miniflare27 = require("miniflare");
@@ -179990,7 +180231,7 @@ var init_MultiworkerRuntimeController = __esm({
       // This is given as a shared secret to the Proxy and User workers
       // so that the User Worker can trust aspects of HTTP requests from the Proxy Worker
       // if it provides the secret in a `MF-Proxy-Shared-Secret` header.
-      #proxyToUserWorkerAuthenticationSecret = (0, import_node_crypto15.randomUUID)();
+      #proxyToUserWorkerAuthenticationSecret = (0, import_node_crypto16.randomUUID)();
       // `buildMiniflareOptions()` is asynchronous, meaning if multiple bundle
       // updates were submitted, the second may apply before the first. Therefore,
       // wrap updates in a mutex, so they're always applied in invocation order.
@@ -184067,85 +184308,6 @@ var init_executionContext = __esm({
   }
 });
 
-// src/api/integrations/platform/services.ts
-async function getServiceBindings(services = []) {
-  if (services.length === 0) {
-    return;
-  }
-  const registeredWorkers = await maybeGetRegisteredWorkers();
-  if (!registeredWorkers) {
-    return;
-  }
-  const foundServices = [];
-  for (const { binding: bindingName, service: serviceName } of services) {
-    const worker = registeredWorkers[serviceName];
-    if (worker) {
-      foundServices.push({
-        bindingName,
-        serviceName,
-        workerDefinition: worker
-      });
-    }
-  }
-  const serviceBindings = {};
-  for (const bindingInfo of foundServices) {
-    serviceBindings[bindingInfo.bindingName] = getServiceBindingProxyFetch(bindingInfo);
-  }
-  return serviceBindings;
-}
-function getServiceBindingProxyFetch({
-  workerDefinition,
-  bindingName,
-  serviceName
-}) {
-  const { protocol, host, port } = workerDefinition;
-  const getExternalUrl = /* @__PURE__ */ __name((request4) => {
-    const newUrl = new URL(request4.url);
-    if (protocol) {
-      newUrl.protocol = protocol;
-    }
-    if (host) {
-      newUrl.host = host;
-    }
-    if (port) {
-      newUrl.port = `${port}`;
-    }
-    return newUrl;
-  }, "getExternalUrl");
-  return async (request4) => {
-    const newUrl = getExternalUrl(request4);
-    try {
-      const resp = await (0, import_undici26.fetch)(newUrl, request4);
-      const respBody = await resp.arrayBuffer();
-      return new import_miniflare30.Response(respBody, resp);
-    } catch {
-      return new import_miniflare30.Response(
-        `Error: Unable to fetch from external service (${serviceName} bound with ${bindingName} binding), please make sure that the service is still running with \`wrangler dev\``,
-        { status: 500 }
-      );
-    }
-  };
-}
-async function maybeGetRegisteredWorkers() {
-  try {
-    return await getRegisteredWorkers2();
-  } catch {
-    return void 0;
-  }
-}
-var import_miniflare30, import_undici26;
-var init_services = __esm({
-  "src/api/integrations/platform/services.ts"() {
-    init_import_meta_url();
-    import_miniflare30 = require("miniflare");
-    import_undici26 = __toESM(require_undici());
-    init_dev_registry();
-    __name(getServiceBindings, "getServiceBindings");
-    __name(getServiceBindingProxyFetch, "getServiceBindingProxyFetch");
-    __name(maybeGetRegisteredWorkers, "maybeGetRegisteredWorkers");
-  }
-});
-
 // src/api/integrations/platform/index.ts
 async function getPlatformProxy(options = {}) {
   const experimentalRemoteBindings = !!options.experimental?.remoteBindings;
@@ -184156,7 +184318,10 @@ async function getPlatformProxy(options = {}) {
   });
   let remoteProxySession = void 0;
   if (experimentalRemoteBindings && config.configPath) {
-    remoteProxySession = (await maybeStartOrUpdateRemoteProxySession(config.configPath) ?? {}).session;
+    remoteProxySession = (await maybeStartOrUpdateRemoteProxySession({
+      path: config.configPath,
+      environment: env6
+    }) ?? {}).session;
   }
   const miniflareOptions = await getMiniflareOptionsFromConfig({
     config,
@@ -184164,7 +184329,7 @@ async function getPlatformProxy(options = {}) {
     remoteProxyConnectionString: remoteProxySession?.remoteProxyConnectionString,
     remoteBindingsEnabled: experimentalRemoteBindings
   });
-  const mf = new import_miniflare31.Miniflare(miniflareOptions);
+  const mf = new import_miniflare30.Miniflare(miniflareOptions);
   const bindings = await mf.getBindings();
   const cf2 = await mf.getCf();
   deepFreeze(cf2);
@@ -184207,18 +184372,12 @@ async function getMiniflareOptionsFromConfig(args) {
 				`);
     }
   }
-  const workerDefinitions = await getBoundRegisteredWorkers({
-    name: config.name,
-    services: bindings.services,
-    durableObjects: config["durable_objects"],
-    tailConsumers: []
-  });
   const { bindingOptions, externalWorkers } = buildMiniflareBindingOptions(
     {
       name: config.name,
       complianceRegion: config.compliance_region,
       bindings,
-      workerDefinitions,
+      workerDefinitions: null,
       queueConsumers: void 0,
       services: bindings.services,
       serviceBindings: {},
@@ -184228,7 +184387,8 @@ async function getMiniflareOptionsFromConfig(args) {
       containerDOClassNames: new Set(
         config.containers?.map((c6) => c6.class_name)
       ),
-      containerBuildId: void 0
+      containerBuildId: void 0,
+      enableContainers: config.dev.enable_containers
     },
     remoteProxyConnectionString,
     remoteBindingsEnabled
@@ -184244,7 +184404,6 @@ async function getMiniflareOptionsFromConfig(args) {
   }
   const assetOptions = processedAssetOptions ? buildAssetOptions({ assets: processedAssetOptions }) : {};
   const defaultPersistRoot = getMiniflarePersistRoot(options.persist);
-  const serviceBindings = await getServiceBindings(bindings.services);
   const miniflareOptions = {
     workers: [
       {
@@ -184252,10 +184411,6 @@ async function getMiniflareOptionsFromConfig(args) {
         modules: true,
         name: config.name,
         ...bindingOptions,
-        serviceBindings: {
-          ...serviceBindings,
-          ...bindingOptions.serviceBindings
-        },
         ...assetOptions
       },
       ...externalWorkers
@@ -184265,7 +184420,9 @@ async function getMiniflareOptionsFromConfig(args) {
   return {
     script: "",
     modules: true,
-    ...miniflareOptions
+    ...miniflareOptions,
+    unsafeDevRegistryPath: getRegistryPath(),
+    unsafeDevRegistryDurableObjectProxy: true
   };
 }
 function getMiniflarePersistRoot(persist) {
@@ -184295,6 +184452,7 @@ function unstable_getMiniflareWorkerOptions(configOrConfigPath, env6, options) {
     config.containers?.map((c6) => c6.class_name)
   );
   const bindings = getBindings2(config, env6, options?.envFiles, true, {}, true);
+  const enableContainers = options?.overrides?.enableContainers !== void 0 ? options?.overrides?.enableContainers : config.dev.enable_containers;
   const { bindingOptions, externalWorkers } = buildMiniflareBindingOptions(
     {
       name: config.name,
@@ -184308,7 +184466,8 @@ function unstable_getMiniflareWorkerOptions(configOrConfigPath, env6, options) {
       imagesLocalMode: !!options?.imagesLocalMode,
       tails: config.tail_consumers,
       containerDOClassNames,
-      containerBuildId: options?.containerBuildId
+      containerBuildId: options?.containerBuildId,
+      enableContainers
     },
     options?.remoteProxyConnectionString,
     options?.remoteBindingsEnabled ?? false
@@ -184316,7 +184475,7 @@ function unstable_getMiniflareWorkerOptions(configOrConfigPath, env6, options) {
   if (bindings.services !== void 0) {
     bindingOptions.serviceBindings = Object.fromEntries(
       bindings.services.map((binding) => {
-        const name2 = binding.service === config.name ? import_miniflare31.kCurrentWorker : binding.service;
+        const name2 = binding.service === config.name ? import_miniflare30.kCurrentWorker : binding.service;
         if (options?.remoteProxyConnectionString && binding.experimental_remote) {
           return [
             binding.binding,
@@ -184342,11 +184501,11 @@ function unstable_getMiniflareWorkerOptions(configOrConfigPath, env6, options) {
             className: binding.class_name,
             scriptName: binding.script_name,
             useSQLite,
-            container: getImageNameFromDOClassName({
+            container: enableContainers && config.containers?.length ? getImageNameFromDOClassName({
               doClassName: binding.class_name,
               containerDOClassNames,
               containerBuildId: options?.containerBuildId
-            })
+            }) : void 0
           }
         ];
       })
@@ -184377,18 +184536,17 @@ function unstable_getMiniflareWorkerOptions(configOrConfigPath, env6, options) {
     externalWorkers
   };
 }
-var import_miniflare31;
+var import_miniflare30;
 var init_platform = __esm({
   "src/api/integrations/platform/index.ts"() {
     init_import_meta_url();
     init_containers_shared();
-    import_miniflare31 = require("miniflare");
+    import_miniflare30 = require("miniflare");
     init_assets();
     init_config2();
     init_entry();
     init_rules();
     init_dev2();
-    init_dev_registry();
     init_class_names_sqlite();
     init_miniflare();
     init_misc_variables();
@@ -184398,7 +184556,6 @@ var init_platform = __esm({
     init_remoteBindings();
     init_caches();
     init_executionContext();
-    init_services();
     init_dev_vars();
     __name(getPlatformProxy, "getPlatformProxy");
     __name(getMiniflareOptionsFromConfig, "getMiniflareOptionsFromConfig");
@@ -184432,6 +184589,7 @@ var init_api3 = __esm({
 // src/cli.ts
 var cli_exports2 = {};
 __export(cli_exports2, {
+  experimental_getWranglerCommands: () => experimental_getWranglerCommands,
   experimental_maybeStartOrUpdateRemoteProxySession: () => maybeStartOrUpdateRemoteProxySession,
   experimental_patchConfig: () => experimental_patchConfig,
   experimental_pickRemoteBindings: () => pickRemoteBindings,
@@ -184530,6 +184688,17 @@ var PatchConfigError = class extends Error {
 
 // src/cli.ts
 init_api3();
+
+// src/experimental-commands-api.ts
+init_import_meta_url();
+init_src();
+function experimental_getWranglerCommands() {
+  const { registry } = createCLIParser([]);
+  return registry.getDefinitionTreeRoot();
+}
+__name(experimental_getWranglerCommands, "experimental_getWranglerCommands");
+
+// src/cli.ts
 if (typeof vitest === "undefined" && require.main === module) {
   main(hideBin(import_process5.default.argv)).catch((e7) => {
     const exitCode = e7 instanceof FatalError && e7.code || 1;
@@ -184542,6 +184711,7 @@ var generateASSETSBinding2 = (
 );
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  experimental_getWranglerCommands,
   experimental_maybeStartOrUpdateRemoteProxySession,
   experimental_patchConfig,
   experimental_pickRemoteBindings,