wrangler 4.24.0 → 4.24.2

package/wrangler-dist/cli.js

@@ -13467,7 +13467,7 @@ var require_headers = __commonJS({
         return headers;
       }
     };
-    var Headers6 = class _Headers {
+    var Headers5 = class _Headers {
       static {
         __name(this, "Headers");
       }
@@ -13665,8 +13665,8 @@ var require_headers = __commonJS({
         return this[kHeadersList];
       }
     };
-    Headers6.prototype[Symbol.iterator] = Headers6.prototype.entries;
-    Object.defineProperties(Headers6.prototype, {
+    Headers5.prototype[Symbol.iterator] = Headers5.prototype.entries;
+    Object.defineProperties(Headers5.prototype, {
       append: kEnumerableProperty,
       delete: kEnumerableProperty,
       get: kEnumerableProperty,
@@ -13698,7 +13698,7 @@ var require_headers = __commonJS({
     };
     module3.exports = {
       fill: fill2,
-      Headers: Headers6,
+      Headers: Headers5,
       HeadersList
     };
   }
@@ -13709,7 +13709,7 @@ var require_response = __commonJS({
   "../../node_modules/.pnpm/undici@5.28.5/node_modules/undici/lib/fetch/response.js"(exports2, module3) {
     "use strict";
     init_import_meta_url();
-    var { Headers: Headers6, HeadersList, fill: fill2 } = require_headers();
+    var { Headers: Headers5, HeadersList, fill: fill2 } = require_headers();
     var { extractBody, cloneBody, mixinBody } = require_body();
     var util5 = require_util();
     var { kEnumerableProperty } = util5;
@@ -13737,7 +13737,7 @@ var require_response = __commonJS({
     var { types } = require("util");
     var ReadableStream3 = globalThis.ReadableStream || require("stream/web").ReadableStream;
     var textEncoder = new TextEncoder("utf-8");
-    var Response13 = class _Response {
+    var Response12 = class _Response {
       static {
         __name(this, "Response");
       }
@@ -13804,7 +13804,7 @@ var require_response = __commonJS({
         init3 = webidl.converters.ResponseInit(init3);
         this[kRealm] = { settingsObject: {} };
         this[kState] = makeResponse({});
-        this[kHeaders] = new Headers6(kConstruct);
+        this[kHeaders] = new Headers5(kConstruct);
         this[kHeaders][kGuard] = "response";
         this[kHeaders][kHeadersList] = this[kState].headersList;
         this[kHeaders][kRealm] = this[kRealm];
@@ -13882,8 +13882,8 @@ var require_response = __commonJS({
         return clonedResponseObject;
       }
     };
-    mixinBody(Response13);
-    Object.defineProperties(Response13.prototype, {
+    mixinBody(Response12);
+    Object.defineProperties(Response12.prototype, {
       type: kEnumerableProperty,
       url: kEnumerableProperty,
       status: kEnumerableProperty,
@@ -13899,7 +13899,7 @@ var require_response = __commonJS({
         configurable: true
       }
     });
-    Object.defineProperties(Response13, {
+    Object.defineProperties(Response12, {
       json: kEnumerableProperty,
       redirect: kEnumerableProperty,
       error: kEnumerableProperty
@@ -14088,7 +14088,7 @@ var require_response = __commonJS({
       makeResponse,
       makeAppropriateNetworkError,
       filterResponse,
-      Response: Response13,
+      Response: Response12,
       cloneResponse
     };
   }
@@ -14100,7 +14100,7 @@ var require_request2 = __commonJS({
     "use strict";
     init_import_meta_url();
     var { extractBody, mixinBody, cloneBody } = require_body();
-    var { Headers: Headers6, fill: fillHeaders, HeadersList } = require_headers();
+    var { Headers: Headers5, fill: fillHeaders, HeadersList } = require_headers();
     var { FinalizationRegistry } = require_dispatcher_weakref()();
     var util5 = require_util();
     var {
@@ -14347,7 +14347,7 @@ var require_request2 = __commonJS({
             requestFinalizer.register(ac2, { signal, abort });
           }
         }
-        this[kHeaders] = new Headers6(kConstruct);
+        this[kHeaders] = new Headers5(kConstruct);
         this[kHeaders][kHeadersList] = request4.headersList;
         this[kHeaders][kGuard] = "request";
         this[kHeaders][kRealm] = this[kRealm];
@@ -14546,7 +14546,7 @@ var require_request2 = __commonJS({
         const clonedRequestObject = new _Request(kConstruct);
         clonedRequestObject[kState] = clonedRequest;
         clonedRequestObject[kRealm] = this[kRealm];
-        clonedRequestObject[kHeaders] = new Headers6(kConstruct);
+        clonedRequestObject[kHeaders] = new Headers5(kConstruct);
         clonedRequestObject[kHeaders][kHeadersList] = clonedRequest.headersList;
         clonedRequestObject[kHeaders][kGuard] = this[kHeaders][kGuard];
         clonedRequestObject[kHeaders][kRealm] = this[kHeaders][kRealm];
@@ -14745,13 +14745,13 @@ var require_fetch = __commonJS({
     "use strict";
     init_import_meta_url();
     var {
-      Response: Response13,
+      Response: Response12,
       makeNetworkError,
       makeAppropriateNetworkError,
       filterResponse,
       makeResponse
     } = require_response();
-    var { Headers: Headers6 } = require_headers();
+    var { Headers: Headers5 } = require_headers();
     var { Request: Request4, makeRequest } = require_request2();
     var zlib2 = require("zlib");
     var {
@@ -14841,7 +14841,7 @@ var require_fetch = __commonJS({
         this.emit("terminated", error2);
       }
     };
-    function fetch15(input, init3 = {}) {
+    function fetch14(input, init3 = {}) {
       webidl.argumentLengthCheck(arguments, 1, { header: "globalThis.fetch" });
       const p6 = createDeferredPromise();
       let requestObject;
@@ -14888,7 +14888,7 @@ var require_fetch = __commonJS({
           );
           return Promise.resolve();
         }
-        responseObject = new Response13();
+        responseObject = new Response12();
         responseObject[kState] = response;
         responseObject[kRealm] = relevantRealm;
         responseObject[kHeaders][kHeadersList] = response.headersList;
@@ -14905,7 +14905,7 @@ var require_fetch = __commonJS({
       });
       return p6.promise;
     }
-    __name(fetch15, "fetch");
+    __name(fetch14, "fetch");
     function finalizeAndReportTiming(response, initiatorType = "other") {
       if (response.type === "error" && response.aborted) {
         return;
@@ -15680,7 +15680,7 @@ var require_fetch = __commonJS({
               }
               let codings = [];
               let location = "";
-              const headers = new Headers6();
+              const headers = new Headers5();
               if (Array.isArray(headersList)) {
                 for (let n6 = 0; n6 < headersList.length; n6 += 2) {
                   const key = headersList[n6 + 0].toString("latin1");
@@ -15765,7 +15765,7 @@ var require_fetch = __commonJS({
               if (status2 !== 101) {
                 return;
               }
-              const headers = new Headers6();
+              const headers = new Headers5();
               for (let n6 = 0; n6 < headersList.length; n6 += 2) {
                 const key = headersList[n6 + 0].toString("latin1");
                 const val2 = headersList[n6 + 1].toString("latin1");
@@ -15786,7 +15786,7 @@ var require_fetch = __commonJS({
     }
     __name(httpNetworkFetch, "httpNetworkFetch");
     module3.exports = {
-      fetch: fetch15,
+      fetch: fetch14,
       Fetch,
       fetching,
       finalizeAndReportTiming
@@ -16683,7 +16683,7 @@ var require_cache = __commonJS({
     var { kEnumerableProperty, isDisturbed } = require_util();
     var { kHeadersList } = require_symbols();
     var { webidl } = require_webidl();
-    var { Response: Response13, cloneResponse } = require_response();
+    var { Response: Response12, cloneResponse } = require_response();
     var { Request: Request4 } = require_request2();
     var { kState, kHeaders, kGuard, kRealm } = require_symbols2();
     var { fetching } = require_fetch();
@@ -16744,7 +16744,7 @@ var require_cache = __commonJS({
         }
         const responseList = [];
         for (const response of responses) {
-          const responseObject = new Response13(response.body?.source ?? null);
+          const responseObject = new Response12(response.body?.source ?? null);
           const body = responseObject[kState].body;
           responseObject[kState] = response;
           responseObject[kState].body = body;
@@ -17199,7 +17199,7 @@ var require_cache = __commonJS({
         converter: webidl.converters.DOMString
       }
     ]);
-    webidl.converters.Response = webidl.interfaceConverter(Response13);
+    webidl.converters.Response = webidl.interfaceConverter(Response12);
     webidl.converters["sequence<RequestInfo>"] = webidl.sequenceConverter(
       webidl.converters.RequestInfo
     );
@@ -17653,10 +17653,10 @@ var require_cookies = __commonJS({
     var { parseSetCookie } = require_parse();
     var { stringify, getHeadersList } = require_util6();
     var { webidl } = require_webidl();
-    var { Headers: Headers6 } = require_headers();
+    var { Headers: Headers5 } = require_headers();
     function getCookies(headers) {
       webidl.argumentLengthCheck(arguments, 1, { header: "getCookies" });
-      webidl.brandCheck(headers, Headers6, { strict: false });
+      webidl.brandCheck(headers, Headers5, { strict: false });
       const cookie = headers.get("cookie");
       const out = {};
       if (!cookie) {
@@ -17671,7 +17671,7 @@ var require_cookies = __commonJS({
     __name(getCookies, "getCookies");
     function deleteCookie(headers, name2, attributes) {
       webidl.argumentLengthCheck(arguments, 2, { header: "deleteCookie" });
-      webidl.brandCheck(headers, Headers6, { strict: false });
+      webidl.brandCheck(headers, Headers5, { strict: false });
       name2 = webidl.converters.DOMString(name2);
       attributes = webidl.converters.DeleteCookieAttributes(attributes);
       setCookie(headers, {
@@ -17684,7 +17684,7 @@ var require_cookies = __commonJS({
     __name(deleteCookie, "deleteCookie");
     function getSetCookies(headers) {
       webidl.argumentLengthCheck(arguments, 1, { header: "getSetCookies" });
-      webidl.brandCheck(headers, Headers6, { strict: false });
+      webidl.brandCheck(headers, Headers5, { strict: false });
       const cookies = getHeadersList(headers).cookies;
       if (!cookies) {
         return [];
@@ -17694,7 +17694,7 @@ var require_cookies = __commonJS({
     __name(getSetCookies, "getSetCookies");
     function setCookie(headers, cookie) {
       webidl.argumentLengthCheck(arguments, 2, { header: "setCookie" });
-      webidl.brandCheck(headers, Headers6, { strict: false });
+      webidl.brandCheck(headers, Headers5, { strict: false });
       cookie = webidl.converters.Cookie(cookie);
       const str = stringify(cookie);
       if (str) {
@@ -18210,7 +18210,7 @@ var require_connection = __commonJS({
     var { CloseEvent } = require_events();
     var { makeRequest } = require_request2();
     var { fetching } = require_fetch();
-    var { Headers: Headers6 } = require_headers();
+    var { Headers: Headers5 } = require_headers();
     var { getGlobalDispatcher: getGlobalDispatcher2 } = require_global2();
     var { kHeadersList } = require_symbols();
     var channels = {};
@@ -18235,7 +18235,7 @@ var require_connection = __commonJS({
         redirect: "error"
       });
       if (options.headers) {
-        const headersList = new Headers6(options.headers)[kHeadersList];
+        const headersList = new Headers5(options.headers)[kHeadersList];
         request4.headersList = headersList;
       }
       const keyValue = crypto8.randomBytes(16).toString("base64");
@@ -19145,7 +19145,7 @@ var require_undici = __commonJS({
     module3.exports.getGlobalDispatcher = getGlobalDispatcher2;
     if (util5.nodeMajor > 16 || util5.nodeMajor === 16 && util5.nodeMinor >= 8) {
       let fetchImpl = null;
-      module3.exports.fetch = /* @__PURE__ */ __name(async function fetch15(resource) {
+      module3.exports.fetch = /* @__PURE__ */ __name(async function fetch14(resource) {
         if (!fetchImpl) {
           fetchImpl = require_fetch().fetch;
         }
@@ -20469,11 +20469,10 @@ var init_UpdateApplicationRolloutRequest = __esm({
 });
 
 // ../containers-shared/src/client/core/request.ts
-var import_undici, 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;
 var init_request = __esm({
   "../containers-shared/src/client/core/request.ts"() {
     init_import_meta_url();
-    import_undici = __toESM(require_undici());
     init_ApiError();
     init_CancelablePromise();
     isDefined = /* @__PURE__ */ __name((value) => {
@@ -20539,7 +20538,7 @@ var init_request = __esm({
     }, "getUrl");
     getFormData = /* @__PURE__ */ __name((options) => {
       if (options.formData) {
-        const formData = new import_undici.FormData();
+        const formData = new FormData();
         const process11 = /* @__PURE__ */ __name((key, value) => {
           if (isString(value) || isBlob(value)) {
             formData.append(key, value);
@@ -20598,7 +20597,7 @@ var init_request = __esm({
           headers["Content-Type"] = "application/json";
         }
       }
-      return new import_undici.Headers(headers);
+      return new Headers(headers);
     }, "getHeaders");
     getRequestBody = /* @__PURE__ */ __name((options) => {
       if (options.body !== void 0) {
@@ -20642,14 +20641,13 @@ var init_request = __esm({
         headers,
         body: body ?? formData,
         method: options.method,
-        signal: controller.signal,
-        dispatcher: config.AGENT ?? void 0
+        signal: controller.signal
       };
       if (config.WITH_CREDENTIALS) {
         request4.credentials = config.CREDENTIALS;
       }
       onCancel(() => controller.abort());
-      return await (0, import_undici.fetch)(url4, request4);
+      return await fetch(url4, request4);
     }, "sendRequest");
     getResponseHeader = /* @__PURE__ */ __name((response, responseHeader) => {
       if (responseHeader) {
@@ -22242,10 +22240,11 @@ async function checkExposedPorts(dockerPath, options) {
     imageTag: options.imageTag,
     formatString: "{{ len .Config.ExposedPorts }}"
   });
-  if (output === "0" && process.platform !== "linux") {
+  if (output === "0") {
     throw new Error(
-      `The container "${options.class_name}" does not expose any ports.
-To develop containers locally on non-Linux platforms, you must expose any ports that you call with \`getTCPPort()\` in your Dockerfile.`
+      `The container "${options.class_name}" does not expose any ports. In your Dockerfile, please expose any ports you intend to connect to.
+For additional information please see: https://developers.cloudflare.com/containers/local-dev/#exposing-ports.
+`
     );
   }
 }
@@ -22415,6 +22414,21 @@ To use an existing image from another repository, see https://developers.cloudfl
     await checkExposedPorts(dockerPath, options);
   }
 }
+async function resolveImageName(accountId, image) {
+  let url4;
+  try {
+    url4 = new URL(`http://${image}`);
+  } catch (_4) {
+    return image;
+  }
+  if (url4.hostname !== getCloudflareContainerRegistry()) {
+    return image;
+  }
+  if (url4.pathname.startsWith(`/${accountId}`)) {
+    return image;
+  }
+  return `${url4.hostname}/${accountId}${url4.pathname}`;
+}
 var init_images = __esm({
   "../containers-shared/src/images.ts"() {
     init_import_meta_url();
@@ -22424,6 +22438,7 @@ var init_images = __esm({
     init_utils();
     __name(pullImage, "pullImage");
     __name(prepareContainerImagesForDev, "prepareContainerImagesForDev");
+    __name(resolveImageName, "resolveImageName");
   }
 });
 
@@ -29500,7 +29515,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.24.0";
+    version = "4.24.2";
   }
 });
 
@@ -49134,7 +49149,7 @@ async function domainUsesAccess(domain2) {
     const cancel3 = setTimeout(() => {
       controller.abort();
     }, 1e3);
-    const output = await (0, import_undici2.fetch)(`https://${domain2}`, {
+    const output = await (0, import_undici.fetch)(`https://${domain2}`, {
       redirect: "manual",
       signal: controller.signal
     });
@@ -49169,12 +49184,12 @@ async function getAccessToken(domain2) {
   }
   throw new Error("Failed to authenticate with Cloudflare Access");
 }
-var import_child_process4, import_undici2, cache, usesAccessCache;
+var import_child_process4, import_undici, cache, usesAccessCache;
 var init_access = __esm({
   "src/user/access.ts"() {
     init_import_meta_url();
     import_child_process4 = require("child_process");
-    import_undici2 = __toESM(require_undici());
+    import_undici = __toESM(require_undici());
     init_errors();
     init_logger();
     cache = {};
@@ -49764,7 +49779,7 @@ async function logout() {
       return;
     }
     const body2 = `client_id=${encodeURIComponent(getClientIdFromEnv())}&token_type_hint=refresh_token&token=${encodeURIComponent(LocalState.refreshToken?.value || "")}`;
-    const response2 = await (0, import_undici3.fetch)(getRevokeUrlFromEnv(), {
+    const response2 = await (0, import_undici2.fetch)(getRevokeUrlFromEnv(), {
       method: "POST",
       body: body2,
       headers: {
@@ -49777,7 +49792,7 @@ async function logout() {
     );
   }
   const body = `client_id=${encodeURIComponent(getClientIdFromEnv())}&token_type_hint=refresh_token&token=${encodeURIComponent(LocalState.refreshToken?.value || "")}`;
-  const response = await (0, import_undici3.fetch)(getRevokeUrlFromEnv(), {
+  const response = await (0, import_undici2.fetch)(getRevokeUrlFromEnv(), {
     method: "POST",
     body,
     headers: {
@@ -49878,7 +49893,7 @@ async function fetchAuthToken(body) {
   if (await domainUsesAccess(getAuthDomainFromEnv())) {
     headers["Cookie"] = `CF_Authorization=${await getCloudflareAccessToken()}`;
   }
-  return await (0, import_undici3.fetch)(getTokenUrlFromEnv(), {
+  return await (0, import_undici2.fetch)(getTokenUrlFromEnv(), {
     method: "POST",
     body: body.toString(),
     headers
@@ -49906,7 +49921,7 @@ async function getJSONFromResponse(response) {
     );
   }
 }
-var import_node_assert2, import_node_crypto2, import_node_fs6, import_node_http, import_node_path12, import_node_url4, import_node_util2, import_toml3, import_undici3, USER_AUTH_CONFIG_PATH, DefaultScopes, DefaultScopeKeys, LocalState, ErrorOAuth2, ErrorUnknown, ErrorNoAuthCode, ErrorInvalidReturnedStateParam, ErrorInvalidJson, ErrorInvalidScope, ErrorInvalidRequest, ErrorInvalidToken, ErrorAuthenticationGrant, ErrorUnauthorizedClient, ErrorAccessDenied, ErrorUnsupportedResponseType, ErrorServerError, ErrorTemporarilyUnavailable, ErrorAccessTokenResponse, ErrorInvalidClient, ErrorInvalidGrant, ErrorUnsupportedGrantType, RawErrorToErrorClassMap, RECOMMENDED_CODE_VERIFIER_LENGTH, RECOMMENDED_STATE_LENGTH, PKCE_CHARSET;
+var import_node_assert2, import_node_crypto2, import_node_fs6, import_node_http, import_node_path12, import_node_url4, import_node_util2, import_toml3, import_undici2, USER_AUTH_CONFIG_PATH, DefaultScopes, DefaultScopeKeys, LocalState, ErrorOAuth2, ErrorUnknown, ErrorNoAuthCode, ErrorInvalidReturnedStateParam, ErrorInvalidJson, ErrorInvalidScope, ErrorInvalidRequest, ErrorInvalidToken, ErrorAuthenticationGrant, ErrorUnauthorizedClient, ErrorAccessDenied, ErrorUnsupportedResponseType, ErrorServerError, ErrorTemporarilyUnavailable, ErrorAccessTokenResponse, ErrorInvalidClient, ErrorInvalidGrant, ErrorUnsupportedGrantType, RawErrorToErrorClassMap, RECOMMENDED_CODE_VERIFIER_LENGTH, RECOMMENDED_STATE_LENGTH, PKCE_CHARSET;
 var init_user = __esm({
   "src/user/user.ts"() {
     init_import_meta_url();
@@ -49919,7 +49934,7 @@ var init_user = __esm({
     import_node_util2 = require("util");
     import_toml3 = __toESM(require_toml());
     init_esm2();
-    import_undici3 = __toESM(require_undici());
+    import_undici2 = __toESM(require_undici());
     init_config2();
     init_config_cache();
     init_dialogs();
@@ -50184,16 +50199,16 @@ async function performApiFetch(complianceConfig, resource, init3 = {}, queryPara
   delete logHeaders["Authorization"];
   logger.debugWithSanitization("HEADERS:", JSON.stringify(logHeaders, null, 2));
   logger.debugWithSanitization("INIT:", JSON.stringify({ ...init3 }, null, 2));
-  if (init3.body instanceof import_undici4.FormData) {
+  if (init3.body instanceof import_undici3.FormData) {
     logger.debugWithSanitization(
       "BODY:",
-      await new import_undici4.Response(init3.body).text(),
+      await new import_undici3.Response(init3.body).text(),
       null,
       2
     );
   }
   logger.debug("-- END CF API REQUEST");
-  return await (0, import_undici4.fetch)(
+  return await (0, import_undici3.fetch)(
     `${getCloudflareApiBaseUrl(complianceConfig)}${resource}${queryString}`,
     {
       method,
@@ -50252,7 +50267,7 @@ function truncate(text, maxLength) {
   return `${text.substring(0, maxLength)}... (length = ${length})`;
 }
 function cloneHeaders(headers) {
-  return headers instanceof import_undici4.Headers ? Object.fromEntries(headers.entries()) : Array.isArray(headers) ? Object.fromEntries(headers) : { ...headers };
+  return headers instanceof import_undici3.Headers ? Object.fromEntries(headers.entries()) : Array.isArray(headers) ? Object.fromEntries(headers) : { ...headers };
 }
 async function requireLoggedIn(complianceConfig) {
   const loggedIn = await loginOrRefreshIfRequired(complianceConfig);
@@ -50279,7 +50294,7 @@ async function fetchKVGetValue(complianceConfig, accountId, namespaceId, key) {
   const headers = {};
   addAuthorizationHeaderIfUnspecified(headers, auth);
   const resource = `${getCloudflareApiBaseUrl(complianceConfig)}/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${key}`;
-  const response = await (0, import_undici4.fetch)(resource, {
+  const response = await (0, import_undici3.fetch)(resource, {
     method: "GET",
     headers
   });
@@ -50297,7 +50312,7 @@ async function fetchR2Objects(complianceConfig, resource, bodyInit = {}) {
   const headers = cloneHeaders(bodyInit.headers);
   addAuthorizationHeaderIfUnspecified(headers, auth);
   addUserAgent(headers);
-  const response = await (0, import_undici4.fetch)(
+  const response = await (0, import_undici3.fetch)(
     `${getCloudflareApiBaseUrl(complianceConfig)}${resource}`,
     {
       ...bodyInit,
@@ -50320,7 +50335,7 @@ async function fetchWorkerDefinitionFromDash(complianceConfig, resource, bodyIni
   const headers = cloneHeaders(bodyInit.headers);
   addAuthorizationHeaderIfUnspecified(headers, auth);
   addUserAgent(headers);
-  let response = await (0, import_undici4.fetch)(
+  let response = await (0, import_undici3.fetch)(
     `${getCloudflareApiBaseUrl(complianceConfig)}${resource}`,
     {
       ...bodyInit,
@@ -50336,11 +50351,11 @@ async function fetchWorkerDefinitionFromDash(complianceConfig, resource, bodyIni
   const usesModules = response.headers.get("content-type")?.startsWith("multipart");
   if (usesModules) {
     if (!response.formData) {
-      response = new import_undici4.Response(await response.text(), response);
+      response = new import_undici3.Response(await response.text(), response);
     }
     const form = await response.formData();
     const files = Array.from(form.entries()).map(
-      ([filename, contents]) => contents instanceof import_undici4.File ? contents : new import_undici4.File([contents], filename)
+      ([filename, contents]) => contents instanceof import_undici3.File ? contents : new import_undici3.File([contents], filename)
     );
     return {
       entrypoint: response.headers.get("cf-entrypoint") ?? "src/index.js",
@@ -50348,19 +50363,19 @@ async function fetchWorkerDefinitionFromDash(complianceConfig, resource, bodyIni
     };
   } else {
     const contents = await response.text();
-    const file = new import_undici4.File([contents], "index.js", { type: "text" });
+    const file = new import_undici3.File([contents], "index.js", { type: "text" });
     return {
       entrypoint: "index.js",
       modules: [file]
     };
   }
 }
-var import_node_assert3, import_undici4;
+var import_node_assert3, import_undici3;
 var init_internal = __esm({
   "src/cfetch/internal.ts"() {
     init_import_meta_url();
     import_node_assert3 = __toESM(require("assert"));
-    import_undici4 = __toESM(require_undici());
+    import_undici3 = __toESM(require_undici());
     init_package();
     init_misc_variables();
     init_errors();
@@ -62550,7 +62565,7 @@ function resolveMemory(args, config) {
   }
   return void 0;
 }
-function resolveAppDiskSize(account, app) {
+function resolveAppDiskSize(app) {
   if (app === void 0) {
     return void 0;
   }
@@ -62698,12 +62713,7 @@ function pushYargs(yargs) {
 }
 async function buildAndMaybePush(args, pathToDocker, push, configPath, containerConfig) {
   try {
-    const account = await loadAccount();
-    const cloudflareAccountID = account.external_account_id;
-    const imageTag = getCloudflareRegistryWithAccountNamespace(
-      cloudflareAccountID,
-      args.tag
-    );
+    const imageTag = `${getCloudflareContainerRegistry()}/${args.tag}`;
     const { buildCmd, dockerfile } = await constructBuildCommand(
       {
         tag: imageTag,
@@ -62725,17 +62735,18 @@ async function buildAndMaybePush(args, pathToDocker, push, configPath, container
       formatString: "{{ .Size }} {{ len .RootFS.Layers }} {{json .RepoDigests}}"
     });
     const [sizeStr, layerStr, repoDigests] = inspectOutput.split(" ");
-    const size = parseInt(sizeStr, 10);
-    const layers = parseInt(layerStr, 10);
-    const MiB = 1024 * 1024;
-    const requiredSize = Math.ceil(size * 1.1 + layers * 16 * MiB);
-    await ensureDiskLimits({
-      requiredSize,
-      account,
-      containerApp: containerConfig
-    });
     let pushed = false;
     if (push) {
+      const account = await loadAccount();
+      const size = parseInt(sizeStr, 10);
+      const layers = parseInt(layerStr, 10);
+      const MiB = 1024 * 1024;
+      const requiredSize = Math.ceil(size * 1.1 + layers * 16 * MiB);
+      await ensureDiskLimits({
+        requiredSize,
+        account,
+        containerApp: containerConfig
+      });
       await dockerLoginManagedRegistry(pathToDocker);
       try {
         const parsedDigests = JSON.parse(repoDigests);
@@ -62745,33 +62756,47 @@ async function buildAndMaybePush(args, pathToDocker, push, configPath, container
           );
         }
         const repositoryOnly = imageTag.split(":")[0];
-        const digests = parsedDigests.filter(
+        const [digest, ...rest] = parsedDigests.filter(
           (d6) => typeof d6 === "string" && d6.split("@")[0] === repositoryOnly
         );
-        if (digests.length !== 1) {
+        if (rest.length > 0) {
           throw new Error(
-            `Expected there to only be 1 valid digests for this repository: ${repositoryOnly} but there were ${digests.length}`
+            `Expected there to only be 1 valid digests for this repository: ${repositoryOnly} but there were ${rest.length + 1}`
           );
         }
+        const [image, hash] = digest.split("@");
+        const resolvedImage = await resolveImageName(
+          account.external_account_id,
+          image
+        );
+        const remoteDigest = `${resolvedImage}@${hash}`;
         await runDockerCmd(
           pathToDocker,
-          ["manifest", "inspect", digests[0]],
+          ["manifest", "inspect", remoteDigest],
           "ignore"
         );
         logger.log("Image already exists remotely, skipping push");
         logger.debug(
-          `Untagging built image: ${imageTag} since there was no change.`
+          `Untagging built image: ${args.tag} since there was no change.`
         );
         await runDockerCmd(pathToDocker, ["image", "rm", imageTag]);
-        return { image: digests[0], pushed: false };
+        return { image: remoteDigest, pushed: false };
       } catch (error2) {
-        logger.log(`Image does not exist remotely, pushing: ${imageTag}`);
         if (error2 instanceof Error) {
           logger.debug(
-            `Checking for local image ${imageTag} failed with error: ${error2.message}`
+            `Checking for local image ${args.tag} failed with error: ${error2.message}`
           );
         }
-        await runDockerCmd(pathToDocker, ["push", imageTag]);
+        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;
       }
     }
@@ -62807,12 +62832,12 @@ async function buildCommand(args, config) {
     );
   }
 }
-async function pushCommand(args, _4) {
+async function pushCommand(args, config) {
   try {
     await dockerLoginManagedRegistry(args.pathToDocker);
-    const account = await loadAccount();
+    const accountId = config.account_id || await getAccountId(config);
     const newTag = getCloudflareRegistryWithAccountNamespace(
-      account.external_account_id,
+      accountId,
       args.TAG
     );
     const dockerPath = args.pathToDocker ?? getDockerPath();
@@ -62829,7 +62854,7 @@ async function pushCommand(args, _4) {
 async function ensureDiskLimits(options) {
   const MB = 1e3 * 1e3;
   const MiB = 1024 * 1024;
-  const appDiskSize = resolveAppDiskSize(options.account, options.containerApp);
+  const appDiskSize = resolveAppDiskSize(options.containerApp);
   const accountDiskSize = (options.account.limits.disk_mb_per_deployment ?? 2e3) * MB;
   if (appDiskSize && appDiskSize > accountDiskSize) {
     throw new UserError(
@@ -62856,6 +62881,7 @@ var init_build2 = __esm({
     init_misc_variables();
     init_errors();
     init_logger();
+    init_user2();
     init_common();
     init_locations();
     __name(buildYargs, "buildYargs");
@@ -63975,22 +64001,6 @@ function sortObjectRecursive(object) {
   }
   return sortObjectKeys(objectCopy);
 }
-async function resolveImageName(config, image) {
-  let url4;
-  try {
-    url4 = new URL(`http://${image}`);
-  } catch (_4) {
-    return image;
-  }
-  if (url4.hostname !== getCloudflareContainerRegistry()) {
-    return image;
-  }
-  const accountId = config.account_id || await getAccountId(config);
-  if (url4.pathname.startsWith(`/${accountId}`)) {
-    return image;
-  }
-  return `${url4.hostname}/${accountId}${url4.pathname}`;
-}
 async function apply(args, config) {
   startSection(
     "Deploy a container application",
@@ -64169,13 +64179,14 @@ async function apply(args, config) {
     s5.split("\n").map((line) => line.trim()).forEach((el) => {
       printLine(el, "  ");
     });
+    const accountId = config.account_id || await getAccountId(config);
     const configToPush = {
       ...appConfig,
       configuration: {
         ...appConfig.configuration,
         // De-sugar image name. We do it here so that the user
         // sees the simplified image name in diffs.
-        image: await resolveImageName(config, appConfig.configuration.image)
+        image: await resolveImageName(accountId, appConfig.configuration.image)
       }
     };
     actions.push({
@@ -64352,7 +64363,6 @@ var init_apply = __esm({
     __name(stripUndefined, "stripUndefined");
     __name(sortObjectKeys, "sortObjectKeys");
     __name(sortObjectRecursive, "sortObjectRecursive");
-    __name(resolveImageName, "resolveImageName");
     __name(apply, "apply");
     __name(applyCommand, "applyCommand");
   }
@@ -64800,7 +64810,7 @@ function unexpectedKVKeyValueProps(keyValue) {
   return props.filter((prop) => !KeyValueKeys.has(prop));
 }
 function asFormData(fields) {
-  const formData = new import_undici5.FormData();
+  const formData = new import_undici4.FormData();
   for (const [name2, value] of Object.entries(fields)) {
     formData.append(name2, Buffer.isBuffer(value) ? new import_node_buffer2.Blob([value]) : value);
   }
@@ -64979,14 +64989,14 @@ async function usingLocalNamespace(persistTo, config, namespaceId, closure) {
     await mf.dispose();
   }
 }
-var import_node_buffer2, import_node_url8, import_miniflare9, import_undici5, API_MAX, BATCH_KEY_MAX, BATCH_MAX_ERRORS_WARNINGS, KeyValueKeys, formatNumber;
+var import_node_buffer2, import_node_url8, import_miniflare9, import_undici4, API_MAX, BATCH_KEY_MAX, BATCH_MAX_ERRORS_WARNINGS, KeyValueKeys, formatNumber;
 var init_helpers4 = __esm({
   "src/kv/helpers.ts"() {
     init_import_meta_url();
     import_node_buffer2 = require("buffer");
     import_node_url8 = require("url");
     import_miniflare9 = require("miniflare");
-    import_undici5 = __toESM(require_undici());
+    import_undici4 = __toESM(require_undici());
     init_cfetch();
     init_get_local_persistence_path();
     init_miniflare();
@@ -65373,7 +65383,7 @@ function getMetricsDispatcher(options) {
       return;
     }
     logger.debug(`Metrics dispatcher: Posting data ${JSON.stringify(body)}`);
-    const request4 = (0, import_undici6.fetch)(`${SPARROW_URL}/api/v1/event`, {
+    const request4 = (0, import_undici5.fetch)(`${SPARROW_URL}/api/v1/event`, {
       method: "POST",
       headers: {
         Accept: "*/*",
@@ -65414,12 +65424,12 @@ Cloudflare collects anonymous telemetry about your usage of Wrangler. Learn more
   }
   __name(printMetricsBanner, "printMetricsBanner");
 }
-var import_undici6, SPARROW_URL, normalise, exclude, sanitiseUserInput, getAllowedArgs, redactArgValues;
+var import_undici5, SPARROW_URL, normalise, exclude, sanitiseUserInput, getAllowedArgs, redactArgValues;
 var init_metrics_dispatcher = __esm({
   "src/metrics/metrics-dispatcher.ts"() {
     init_import_meta_url();
     init_source();
-    import_undici6 = __toESM(require_undici());
+    import_undici5 = __toESM(require_undici());
     init_config2();
     init_is_interactive();
     init_logger();
@@ -66276,7 +66286,7 @@ function fromMimeType(mimeType) {
   return moduleType;
 }
 function createWorkerUploadForm(worker) {
-  const formData = new import_undici7.FormData();
+  const formData = new import_undici6.FormData();
   const {
     main: main2,
     sourceMaps,
@@ -66312,6 +66322,7 @@ function createWorkerUploadForm(worker) {
           jwt: assets.jwt,
           config: assetConfig
         },
+        ...annotations && { annotations },
         ...compatibility_date && { compatibility_date },
         ...compatibility_flags && { compatibility_flags }
       })
@@ -66529,7 +66540,7 @@ function createWorkerUploadForm(worker) {
     });
     formData.set(
       name2,
-      new import_undici7.File(
+      new import_undici6.File(
         [typeof source === "string" ? (0, import_node_fs14.readFileSync)(source) : source],
         typeof source === "string" ? source : name2,
         {
@@ -66581,7 +66592,7 @@ function createWorkerUploadForm(worker) {
     if (name2 !== "__STATIC_CONTENT_MANIFEST") {
       formData.set(
         name2,
-        new import_undici7.File([(0, import_node_fs14.readFileSync)(filePath)], filePath, {
+        new import_undici6.File([(0, import_node_fs14.readFileSync)(filePath)], filePath, {
           type: "text/plain"
         })
       );
@@ -66595,7 +66606,7 @@ function createWorkerUploadForm(worker) {
     });
     formData.set(
       name2,
-      new import_undici7.File(
+      new import_undici6.File(
         [typeof source === "string" ? (0, import_node_fs14.readFileSync)(source) : source],
         typeof source === "string" ? source : name2,
         {
@@ -66630,7 +66641,7 @@ function createWorkerUploadForm(worker) {
       if (module3.name === "__STATIC_CONTENT_MANIFEST") {
         formData.set(
           module3.name,
-          new import_undici7.File([module3.content], module3.name, {
+          new import_undici6.File([module3.content], module3.name, {
             type: "text/plain"
           })
         );
@@ -66644,7 +66655,7 @@ function createWorkerUploadForm(worker) {
         });
         formData.set(
           name2,
-          new import_undici7.File([module3.content], module3.name, {
+          new import_undici6.File([module3.content], module3.name, {
             type: module3.type === "compiled-wasm" ? "application/wasm" : module3.type === "text" ? "text/plain" : "application/octet-stream"
           })
         );
@@ -66661,7 +66672,7 @@ function createWorkerUploadForm(worker) {
     capnpSchemaOutputFile = `./capnp-${Date.now()}.compiled`;
     formData.set(
       capnpSchemaOutputFile,
-      new import_undici7.File([capnpOutput], capnpSchemaOutputFile, {
+      new import_undici6.File([capnpOutput], capnpSchemaOutputFile, {
         type: "application/octet-stream"
       })
     );
@@ -66718,7 +66729,7 @@ function createWorkerUploadForm(worker) {
   for (const module3 of [main2].concat(modules || [])) {
     formData.set(
       module3.name,
-      new import_undici7.File([module3.content], module3.name, {
+      new import_undici6.File([module3.content], module3.name, {
         type: toMimeType(module3.type ?? main2.type ?? "esm")
       })
     );
@@ -66726,21 +66737,21 @@ function createWorkerUploadForm(worker) {
   for (const sourceMap of sourceMaps || []) {
     formData.set(
       sourceMap.name,
-      new import_undici7.File([sourceMap.content], sourceMap.name, {
+      new import_undici6.File([sourceMap.content], sourceMap.name, {
         type: "application/source-map"
       })
     );
   }
   return formData;
 }
-var import_node_assert13, import_node_fs14, import_node_path26, import_undici7, moduleTypeMimeType;
+var import_node_assert13, import_node_fs14, import_node_path26, import_undici6, moduleTypeMimeType;
 var init_create_worker_upload_form = __esm({
   "src/deployment-bundle/create-worker-upload-form.ts"() {
     init_import_meta_url();
     import_node_assert13 = __toESM(require("assert"));
     import_node_fs14 = require("fs");
     import_node_path26 = __toESM(require("path"));
-    import_undici7 = __toESM(require_undici());
+    import_undici6 = __toESM(require_undici());
     init_errors();
     init_bindings();
     init_capnp();
@@ -75016,13 +75027,13 @@ var init_utils5 = __esm({
 });
 
 // src/ai/createFinetune.ts
-var import_fs14, import_path12, import_undici8, requiredAssets, aiFineTuneCreateCommand;
+var import_fs14, import_path12, import_undici7, requiredAssets, aiFineTuneCreateCommand;
 var init_createFinetune = __esm({
   "src/ai/createFinetune.ts"() {
     init_import_meta_url();
     import_fs14 = __toESM(require("fs"));
     import_path12 = __toESM(require("path"));
-    import_undici8 = __toESM(require_undici());
+    import_undici7 = __toESM(require_undici());
     init_cfetch();
     init_create_command();
     init_logger();
@@ -75086,7 +75097,7 @@ var init_createFinetune = __esm({
                     `\u{1F300} Uploading file "${filePath}" to "${finetune_name}"...`
                   );
                   try {
-                    const formdata = new import_undici8.FormData();
+                    const formdata = new import_undici7.FormData();
                     formdata.set("file_name", file.name);
                     formdata.set("file", new Blob([import_fs14.default.readFileSync(filePath)]));
                     await fetchResult(
@@ -78443,7 +78454,7 @@ async function uploadAndBeginIngestion(complianceConfig, accountId, db, file, et
   const { upload_url, filename } = initResponse;
   const { size } = await import_fs15.promises.stat(file);
   const uploadResponse = await spinnerWhile({
-    promise: (0, import_undici9.fetch)(upload_url, {
+    promise: (0, import_undici8.fetch)(upload_url, {
       method: "PUT",
       headers: {
         "Content-length": `${size}`
@@ -78556,7 +78567,7 @@ async function checkForSQLiteBinary(filename) {
     );
   }
 }
-var import_fs15, import_node_assert16, import_node_path27, import_md5_file, import_miniflare12, import_undici9, d1ExecuteCommand;
+var import_fs15, import_node_assert16, import_node_path27, import_md5_file, import_miniflare12, import_undici8, d1ExecuteCommand;
 var init_execute = __esm({
   "src/d1/execute.ts"() {
     init_import_meta_url();
@@ -78567,7 +78578,7 @@ var init_execute = __esm({
     init_source();
     import_md5_file = __toESM(require_md5_file());
     import_miniflare12 = require("miniflare");
-    import_undici9 = __toESM(require_undici());
+    import_undici8 = __toESM(require_undici());
     init_cfetch();
     init_config2();
     init_create_command();
@@ -78789,7 +78800,7 @@ async function exportRemotely(config, name2, output, tables, noSchema, noData) {
   await spinnerWhile({
     startMessage: `Downloading SQL to ${output}`,
     async promise() {
-      const contents = await (0, import_undici10.fetch)(finalResponse.result.signed_url);
+      const contents = await (0, import_undici9.fetch)(finalResponse.result.signed_url);
       if (!contents.ok) {
         throw new Error(
           `There was an error while downloading from the presigned URL with status code: ${contents.status}`
@@ -78846,7 +78857,7 @@ async function pollExport(s5, complianceConfig, accountId, db, dumpOptions, curr
     );
   }
 }
-var import_promises12, import_node_path28, import_miniflare13, import_undici10, d1ExportCommand;
+var import_promises12, import_node_path28, import_miniflare13, import_undici9, d1ExportCommand;
 var init_export = __esm({
   "src/d1/export.ts"() {
     init_import_meta_url();
@@ -78855,7 +78866,7 @@ var init_export = __esm({
     init_interactive();
     init_source();
     import_miniflare13 = require("miniflare");
-    import_undici10 = __toESM(require_undici());
+    import_undici9 = __toESM(require_undici());
     init_cfetch();
     init_config2();
     init_create_command();
@@ -81222,7 +81233,7 @@ async function runSearch(searchTerm) {
   });
   (0, import_node_assert18.default)(id, "Missing Algolia App ID");
   (0, import_node_assert18.default)(key, "Missing Algolia Key");
-  const searchResp = await (0, import_undici11.fetch)(
+  const searchResp = await (0, import_undici10.fetch)(
     `https://${id}-dsn.algolia.net/1/indexes/${index}/query`,
     {
       method: "POST",
@@ -81250,12 +81261,12 @@ async function runSearch(searchTerm) {
     return;
   }
 }
-var import_node_assert18, import_undici11;
+var import_node_assert18, import_undici10;
 var init_helpers7 = __esm({
   "src/docs/helpers.ts"() {
     init_import_meta_url();
     import_node_assert18 = __toESM(require("assert"));
-    import_undici11 = __toESM(require_undici());
+    import_undici10 = __toESM(require_undici());
     init_logger();
     __name(runSearch, "runSearch");
   }
@@ -84405,7 +84416,7 @@ async function createUploadWorkerBundleContents(workerBundle, config) {
     delete metadata.bindings;
   }
   workerBundleFormData.set("metadata", JSON.stringify(metadata));
-  return await new import_undici12.Response(workerBundleFormData).blob();
+  return await new import_undici11.Response(workerBundleFormData).blob();
 }
 function createWorkerBundleFormData(workerBundle, config) {
   const mainModule = {
@@ -84437,13 +84448,13 @@ function createWorkerBundleFormData(workerBundle, config) {
     observability: void 0
   });
 }
-var import_node_fs19, import_node_path34, import_undici12;
+var import_node_fs19, import_node_path34, import_undici11;
 var init_create_worker_bundle_contents = __esm({
   "src/api/pages/create-worker-bundle-contents.ts"() {
     init_import_meta_url();
     import_node_fs19 = require("fs");
     import_node_path34 = __toESM(require("path"));
-    import_undici12 = __toESM(require_undici());
+    import_undici11 = __toESM(require_undici());
     init_bindings();
     init_create_worker_upload_form();
     init_source_maps();
@@ -87416,7 +87427,7 @@ async function deploy2({
     projectName,
     skipCaching: skipCaching ?? false
   });
-  const formData = new import_undici13.FormData();
+  const formData = new import_undici12.FormData();
   formData.append("manifest", JSON.stringify(manifest));
   if (branch) {
     formData.append("branch", branch);
@@ -87431,17 +87442,17 @@ async function deploy2({
     formData.append("commit_dirty", commitDirty);
   }
   if (_headers) {
-    formData.append("_headers", new import_undici13.File([_headers], "_headers"));
+    formData.append("_headers", new import_undici12.File([_headers], "_headers"));
     logger.log(`\u2728 Uploading _headers`);
   }
   if (_redirects) {
-    formData.append("_redirects", new import_undici13.File([_redirects], "_redirects"));
+    formData.append("_redirects", new import_undici12.File([_redirects], "_redirects"));
     logger.log(`\u2728 Uploading _redirects`);
   }
   if (filepathRoutingConfig) {
     formData.append(
       "functions-filepath-routing-config.json",
-      new import_undici13.File(
+      new import_undici12.File(
         [filepathRoutingConfig],
         "functions-filepath-routing-config.json"
       )
@@ -87504,7 +87515,7 @@ async function deploy2({
     );
     formData.append(
       "_worker.bundle",
-      new import_undici13.File([workerBundleContents], "_worker.bundle")
+      new import_undici12.File([workerBundleContents], "_worker.bundle")
     );
     logger.log(`\u2728 Uploading Worker bundle`);
     if (_routesCustom) {
@@ -87513,7 +87524,7 @@ async function deploy2({
         validateRoutes(routesCustomJSON, (0, import_node_path46.join)(directory, "_routes.json"));
         formData.append(
           "_routes.json",
-          new import_undici13.File([_routesCustom], "_routes.json")
+          new import_undici12.File([_routesCustom], "_routes.json")
         );
         logger.log(`\u2728 Uploading _routes.json`);
       } catch (err) {
@@ -87530,7 +87541,7 @@ async function deploy2({
     );
     formData.append(
       "_worker.bundle",
-      new import_undici13.File([workerBundleContents], "_worker.bundle")
+      new import_undici12.File([workerBundleContents], "_worker.bundle")
     );
     logger.log(`\u2728 Uploading Functions bundle`);
     if (_routesCustom) {
@@ -87539,7 +87550,7 @@ async function deploy2({
         validateRoutes(routesCustomJSON, (0, import_node_path46.join)(directory, "_routes.json"));
         formData.append(
           "_routes.json",
-          new import_undici13.File([_routesCustom], "_routes.json")
+          new import_undici12.File([_routesCustom], "_routes.json")
         );
         logger.log(`\u2728 Uploading _routes.json`);
       } catch (err) {
@@ -87553,7 +87564,7 @@ async function deploy2({
         if (_routesGenerated) {
           formData.append(
             "_routes.json",
-            new import_undici13.File([_routesGenerated], "_routes.json")
+            new import_undici12.File([_routesGenerated], "_routes.json")
           );
         }
       } catch {
@@ -87588,7 +87599,7 @@ async function deploy2({
   }
   throw lastErr;
 }
-var import_node_crypto9, import_node_fs24, import_promises21, import_node_path46, import_node_process11, import_undici13;
+var import_node_crypto9, import_node_fs24, import_promises21, import_node_path46, import_node_process11, import_undici12;
 var init_deploy4 = __esm({
   "src/api/pages/deploy.ts"() {
     init_import_meta_url();
@@ -87597,7 +87608,7 @@ var init_deploy4 = __esm({
     import_promises21 = require("fs/promises");
     import_node_path46 = __toESM(require("path"));
     import_node_process11 = require("process");
-    import_undici13 = __toESM(require_undici());
+    import_undici12 = __toESM(require_undici());
     init_cfetch();
     init_config2();
     init_bundle();
@@ -91722,14 +91733,14 @@ async function parseBulkInputToObject(input) {
   }
   return content;
 }
-var import_node_path50, import_node_readline2, import_dotenv2, import_undici14, VERSION_NOT_DEPLOYED_ERR_CODE, secretNamespace, secretPutCommand, secretDeleteCommand, secretListCommand, secretBulkCommand;
+var import_node_path50, import_node_readline2, import_dotenv2, import_undici13, VERSION_NOT_DEPLOYED_ERR_CODE, secretNamespace, secretPutCommand, secretDeleteCommand, secretListCommand, secretBulkCommand;
 var init_secret = __esm({
   "src/secret/index.ts"() {
     init_import_meta_url();
     import_node_path50 = __toESM(require("path"));
     import_node_readline2 = __toESM(require("readline"));
     import_dotenv2 = __toESM(require_main2());
-    import_undici14 = __toESM(require_undici());
+    import_undici13 = __toESM(require_undici());
     init_cfetch();
     init_config2();
     init_create_command();
@@ -92014,7 +92025,7 @@ var init_secret = __esm({
         __name(getSettings2, "getSettings");
         function putBindingsSettings(bindings) {
           const url4 = !args.env || isLegacyEnv(config) ? `/accounts/${accountId}/workers/scripts/${scriptName}/settings` : `/accounts/${accountId}/workers/services/${scriptName}/environments/${args.env}/settings`;
-          const data = new import_undici14.FormData();
+          const data = new import_undici13.FormData();
           data.set("settings", JSON.stringify({ bindings }));
           return fetchResult(config, url4, {
             method: "PATCH",
@@ -141919,13 +141930,13 @@ async function closeSentry() {
     await close();
   }
 }
-var import_undici17, sentryReportingAllowed, makeSentry10Transport, disabledDefaultIntegrations;
+var import_undici16, sentryReportingAllowed, makeSentry10Transport, disabledDefaultIntegrations;
 var init_sentry = __esm({
   "src/sentry/index.ts"() {
     init_import_meta_url();
     init_esm9();
     init_esm6();
-    import_undici17 = __toESM(require_undici());
+    import_undici16 = __toESM(require_undici());
     init_package();
     init_dialogs();
     init_logger();
@@ -141942,9 +141953,9 @@ var init_sentry = __esm({
             const eventsToSend = [...eventQueue];
             eventQueue = [];
             for (const event of eventsToSend) {
-              await (0, import_undici17.fetch)(event[0], event[1]);
+              await (0, import_undici16.fetch)(event[0], event[1]);
             }
-            const response = await (0, import_undici17.fetch)(
+            const response = await (0, import_undici16.fetch)(
               `https://platform.dash.cloudflare.com/sentry/envelope`,
               {
                 method: "POST",
@@ -144281,13 +144292,13 @@ var init_info4 = __esm({
 });
 
 // src/vectorize/insert.ts
-var import_node_fs28, import_node_readline3, import_undici18, vectorizeInsertCommand;
+var import_node_fs28, import_node_readline3, import_undici17, vectorizeInsertCommand;
 var init_insert = __esm({
   "src/vectorize/insert.ts"() {
     init_import_meta_url();
     import_node_fs28 = require("fs");
     import_node_readline3 = require("readline");
-    import_undici18 = __toESM(require_undici());
+    import_undici17 = __toESM(require_undici());
     init_create_command();
     init_errors();
     init_logger();
@@ -144348,10 +144359,10 @@ var init_insert = __esm({
         }
         let vectorInsertCount = 0;
         for await (const batch of getBatchFromFile(rl, args.batchSize)) {
-          const formData = new import_undici18.FormData();
+          const formData = new import_undici17.FormData();
           formData.append(
             "vectors",
-            new import_undici18.File([batch.join(`
+            new import_undici17.File([batch.join(`
 `)], "vectors.ndjson", {
               type: "application/x-ndjson"
             })
@@ -144706,13 +144717,13 @@ var init_query = __esm({
 });
 
 // src/vectorize/upsert.ts
-var import_node_fs29, import_node_readline4, import_undici19, vectorizeUpsertCommand;
+var import_node_fs29, import_node_readline4, import_undici18, vectorizeUpsertCommand;
 var init_upsert = __esm({
   "src/vectorize/upsert.ts"() {
     init_import_meta_url();
     import_node_fs29 = require("fs");
     import_node_readline4 = require("readline");
-    import_undici19 = __toESM(require_undici());
+    import_undici18 = __toESM(require_undici());
     init_create_command();
     init_errors();
     init_logger();
@@ -144764,10 +144775,10 @@ var init_upsert = __esm({
         }
         let vectorUpsertCount = 0;
         for await (const batch of getBatchFromFile(rl, args.batchSize)) {
-          const formData = new import_undici19.FormData();
+          const formData = new import_undici18.FormData();
           formData.append(
             "vectors",
-            new import_undici19.File([batch.join(`
+            new import_undici18.File([batch.join(`
 `)], "vectors.ndjson", {
               type: "application/x-ndjson"
             })
@@ -147397,17 +147408,20 @@ var init_view2 = __esm({
             Message: version5.annotations?.["workers/message"] || BLANK_INPUT5
           })
         );
-        logRaw("------------------------------------------------------------");
-        const scriptInfo = {
-          Handlers: version5.resources.script.handlers.join(", ")
-        };
+        const scriptInfo = {};
+        if (version5.resources.script.handlers) {
+          scriptInfo.Handlers = version5.resources.script.handlers.join(", ");
+        }
         if (version5.resources.script_runtime.compatibility_date) {
           scriptInfo["Compatibility Date"] = version5.resources.script_runtime.compatibility_date;
         }
         if (version5.resources.script_runtime.compatibility_flags) {
           scriptInfo["Compatibility Flags"] = version5.resources.script_runtime.compatibility_flags.join(", ");
         }
-        logRaw(formatLabelledValues(scriptInfo));
+        if (Object.keys(scriptInfo).length > 0) {
+          logRaw("------------------------------------------------------------");
+          logRaw(formatLabelledValues(scriptInfo));
+        }
         const secrets = version5.resources.bindings.filter(
           (binding) => binding.type === "secret_text"
         );
@@ -152289,7 +152303,7 @@ ${tryRunningItIn}${oneOfThese}`
     }
   }
 }
-var import_node_assert22, import_node_os7, import_promises31, import_undici20;
+var import_node_assert22, import_node_os7, import_promises31, import_undici19;
 var init_src = __esm({
   "src/index.ts"() {
     init_import_meta_url();
@@ -152298,7 +152312,7 @@ var init_src = __esm({
     import_promises31 = require("timers/promises");
     init_containers_shared();
     init_source();
-    import_undici20 = __toESM(require_undici());
+    import_undici19 = __toESM(require_undici());
     init_yargs();
     init_package();
     init_ai();
@@ -152455,7 +152469,7 @@ var init_src = __esm({
     init_trigger();
     init_wrangler_banner();
     if (proxy) {
-      (0, import_undici20.setGlobalDispatcher)(new import_undici20.ProxyAgent(proxy));
+      (0, import_undici19.setGlobalDispatcher)(new import_undici19.ProxyAgent(proxy));
       logger.log(
         `Proxy environment variables detected. We'll use your proxy for fetch requests.`
       );
@@ -153151,7 +153165,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
     let workerBundle;
     const dockerPath = getDockerPath();
     if (config.containers) {
-      const hasDockerfiles = config.containers?.some(
+      const hasDockerfiles = config.containers.some(
         (container) => isDockerfile(
           container.image ?? container.configuration?.image,
           config.configPath
@@ -153329,7 +153343,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
     }
     if (props.outFile) {
       (0, import_node_fs31.mkdirSync)(import_node_path56.default.dirname(props.outFile), { recursive: true });
-      const serializedFormData = await new import_undici21.Response(workerBundle).arrayBuffer();
+      const serializedFormData = await new import_undici20.Response(workerBundle).arrayBuffer();
       (0, import_node_fs31.writeFileSync)(props.outFile, Buffer.from(serializedFormData));
     }
   } finally {
@@ -153595,7 +153609,7 @@ async function updateQueueConsumers(scriptName, config) {
   }
   return updateConsumers;
 }
-var import_node_assert23, import_node_fs31, import_node_path56, import_node_url9, import_undici21, validateRoutes3;
+var import_node_assert23, import_node_fs31, import_node_path56, import_node_url9, import_undici20, validateRoutes3;
 var init_deploy7 = __esm({
   "src/deploy/deploy.ts"() {
     init_import_meta_url();
@@ -153606,7 +153620,7 @@ var init_deploy7 = __esm({
     init_cli();
     init_containers_shared();
     init_dist2();
-    import_undici21 = __toESM(require_undici());
+    import_undici20 = __toESM(require_undici());
     init_assets();
     init_cfetch();
     init_deploy();
@@ -153843,7 +153857,7 @@ function errorOnLegacyPagesWorkerJSAsset(file, hasAssetsIgnoreFile) {
     }
   }
 }
-var import_node_assert24, import_node_fs32, import_promises35, path60, import_undici22, BULK_UPLOAD_CONCURRENCY2, MAX_UPLOAD_ATTEMPTS2, MAX_UPLOAD_GATEWAY_ERRORS2, MAX_DIFF_LINES2, syncAssets, buildAssetManifest, NonExistentAssetsDirError, WORKER_JS_FILENAME;
+var import_node_assert24, import_node_fs32, import_promises35, path60, import_undici21, BULK_UPLOAD_CONCURRENCY2, MAX_UPLOAD_ATTEMPTS2, MAX_UPLOAD_GATEWAY_ERRORS2, MAX_DIFF_LINES2, syncAssets, buildAssetManifest, NonExistentAssetsDirError, WORKER_JS_FILENAME;
 var init_assets = __esm({
   "src/assets.ts"() {
     init_import_meta_url();
@@ -153857,7 +153871,7 @@ var init_assets = __esm({
     init_source();
     init_dist2();
     init_pretty_bytes();
-    import_undici22 = __toESM(require_undici());
+    import_undici21 = __toESM(require_undici());
     init_cfetch();
     init_deploy7();
     init_errors();
@@ -153933,14 +153947,14 @@ var init_assets = __esm({
         attempts = 0;
         let gatewayErrors = 0;
         const doUpload = /* @__PURE__ */ __name(async () => {
-          const payload = new import_undici22.FormData();
+          const payload = new import_undici21.FormData();
           const uploadedFiles = [];
           for (const manifestEntry of bucket) {
             const absFilePath = path60.join(assetDirectory, manifestEntry[0]);
             uploadedFiles.push(manifestEntry[0]);
             payload.append(
               manifestEntry[1].hash,
-              new import_undici22.File(
+              new import_undici21.File(
                 [(await (0, import_promises35.readFile)(absFilePath)).toString("base64")],
                 manifestEntry[1].hash,
                 {
@@ -173777,7 +173791,7 @@ async function createPreviewSession(complianceConfig, account, ctx, abortSignal)
     ` GET ${switchedExchangeUrl}`
   );
   logger.debug("-- END EXCHANGE API REQUEST");
-  const exchangeResponse = await (0, import_undici23.fetch)(switchedExchangeUrl, {
+  const exchangeResponse = await (0, import_undici22.fetch)(switchedExchangeUrl, {
     signal: abortSignal
   });
   const bodyText = await exchangeResponse.text();
@@ -173869,7 +173883,7 @@ async function createWorkerPreview(complianceConfig, init3, account, ctx, sessio
   if (accessToken) {
     headers.cookie = `CF_Authorization=${accessToken}`;
   }
-  (0, import_undici23.fetch)(token.prewarmUrl.href, {
+  (0, import_undici22.fetch)(token.prewarmUrl.href, {
     method: "POST",
     signal: abortSignal,
     headers
@@ -173887,13 +173901,13 @@ async function createWorkerPreview(complianceConfig, init3, account, ctx, sessio
   );
   return token;
 }
-var import_node_crypto13, import_node_url12, import_undici23;
+var import_node_crypto13, import_node_url12, import_undici22;
 var init_create_worker_preview = __esm({
   "src/dev/create-worker-preview.ts"() {
     init_import_meta_url();
     import_node_crypto13 = __toESM(require("crypto"));
     import_node_url12 = require("url");
-    import_undici23 = __toESM(require_undici());
+    import_undici22 = __toESM(require_undici());
     init_cfetch();
     init_create_worker_upload_form();
     init_errors();
@@ -175634,7 +175648,10 @@ function registerDevHotKeys(devEnv, args) {
           }
         });
         await devEnv.config.patch({
-          dev: { containerBuildId: newContainerBuildId }
+          dev: {
+            ...devEnv.config.latestConfig?.dev,
+            containerBuildId: newContainerBuildId
+          }
         });
       }, "handler")
     },
@@ -177264,6 +177281,7 @@ async function generateHandler({
   metadata,
   xServerEnvHeader,
   xDeploymentIdHeader,
+  xWebAnalyticsHeader,
   logError,
   setMetrics,
   findAssetEntryForPath,
@@ -177620,6 +177638,9 @@ async function generateHandler({
         );
       }
       if (isHTMLContentType(asset.contentType) && metadata.analytics?.version === ANALYTICS_VERSION2) {
+        if (xWebAnalyticsHeader) {
+          response.headers.set("x-cf-pages-analytics", "1");
+        }
         return new HTMLRewriter().on("body", {
           element(e7) {
             e7.append(
@@ -177882,6 +177903,7 @@ async function generateAssetsFetch(directory, log2) {
       request: request4,
       metadata,
       xServerEnvHeader: "dev",
+      xWebAnalyticsHeader: false,
       logError: console.error,
       findAssetEntryForPath: /* @__PURE__ */ __name(async (path72) => {
         const filepath = (0, import_node_path66.resolve)((0, import_node_path66.join)(directory, path72));
@@ -177932,7 +177954,7 @@ async function generateAssetsFetch(directory, log2) {
     return await generateResponse(request4);
   };
 }
-var import_node_assert33, import_node_fs35, import_node_path66, import_mime3, import_miniflare29, import_undici24, ProxyDispatcher, invalidAssetsFetch;
+var import_node_assert33, import_node_fs35, import_node_path66, import_mime3, import_miniflare29, import_undici23, ProxyDispatcher, invalidAssetsFetch;
 var init_assets2 = __esm({
   "src/miniflare-cli/assets.ts"() {
     init_import_meta_url();
@@ -177944,10 +177966,10 @@ var init_assets2 = __esm({
     init_esm4();
     import_mime3 = __toESM(require_mime());
     import_miniflare29 = require("miniflare");
-    import_undici24 = __toESM(require_undici());
+    import_undici23 = __toESM(require_undici());
     init_hash();
     __name(generateASSETSBinding, "generateASSETSBinding");
-    ProxyDispatcher = class _ProxyDispatcher extends import_undici24.Dispatcher {
+    ProxyDispatcher = class _ProxyDispatcher extends import_undici23.Dispatcher {
       constructor(host) {
         super();
         this.host = host;
@@ -177955,7 +177977,7 @@ var init_assets2 = __esm({
       static {
         __name(this, "ProxyDispatcher");
       }
-      dispatcher = (0, import_undici24.getGlobalDispatcher)();
+      dispatcher = (0, import_undici23.getGlobalDispatcher)();
       dispatch(options, handler) {
         if (this.host !== null) {
           _ProxyDispatcher.reinstateHostHeader(options.headers, this.host);
@@ -178956,7 +178978,7 @@ unstable_dev()'s behaviour will likely change in future releases`
       devServer.unregisterHotKeys?.();
     }, "stop"),
     fetch: /* @__PURE__ */ __name(async (input, init3) => {
-      return await (0, import_undici25.fetch)(
+      return await (0, import_undici24.fetch)(
         ...parseRequestInput(address, port, input, init3, options?.localProtocol)
       );
     }, "fetch"),
@@ -178969,7 +178991,7 @@ function parseRequestInput(readyAddress, readyPort, input = "/", init3, protocol
   if (typeof input === "string") {
     input = new URL(input, "http://placeholder");
   }
-  const forward = new import_undici25.Request(input, init3);
+  const forward = new import_undici24.Request(input, init3);
   const url4 = new URL(forward.url);
   forward.headers.set("MF-Original-URL", url4.toString());
   forward.headers.set("MF-Disable-Pretty-Error", "true");
@@ -178981,12 +179003,12 @@ function parseRequestInput(readyAddress, readyPort, input = "/", init3, protocol
   }
   return [url4, forward];
 }
-var import_node_events7, import_undici25;
+var import_node_events7, import_undici24;
 var init_dev3 = __esm({
   "src/api/dev.ts"() {
     init_import_meta_url();
     import_node_events7 = __toESM(require("events"));
-    import_undici25 = __toESM(require_undici());
+    import_undici24 = __toESM(require_undici());
     init_dev2();
     init_misc_variables();
     init_experimental_flags();
@@ -179131,7 +179153,7 @@ function getServiceBindingProxyFetch({
   return async (request4) => {
     const newUrl = getExternalUrl(request4);
     try {
-      const resp = await (0, import_undici26.fetch)(newUrl, request4);
+      const resp = await (0, import_undici25.fetch)(newUrl, request4);
       const respBody = await resp.arrayBuffer();
       return new import_miniflare30.Response(respBody, resp);
     } catch {
@@ -179149,12 +179171,12 @@ async function maybeGetRegisteredWorkers() {
     return void 0;
   }
 }
-var import_miniflare30, import_undici26;
+var import_miniflare30, import_undici25;
 var init_services = __esm({
   "src/api/integrations/platform/services.ts"() {
     init_import_meta_url();
     import_miniflare30 = require("miniflare");
-    import_undici26 = __toESM(require_undici());
+    import_undici25 = __toESM(require_undici());
     init_dev_registry();
     __name(getServiceBindings, "getServiceBindings");
     __name(getServiceBindingProxyFetch, "getServiceBindingProxyFetch");