wrangler 4.70.0 → 4.72.0

package/wrangler-dist/cli.js

@@ -38325,7 +38325,7 @@ async function prepareContainerImagesForDev(args) {
       await checkExposedPorts(dockerPath, options);
     }
   }
-  if (!aborted && args.compatibilityFlags?.includes("experimental")) {
+  if (!aborted) {
     await pullEgressInterceptorImage(dockerPath);
   }
 }
@@ -38370,7 +38370,7 @@ var init_images = __esm({
     init_login();
     init_registry2();
     init_utils();
-    DEFAULT_CONTAINER_EGRESS_INTERCEPTOR_IMAGE = "cloudflare/proxy-everything:4dc6c7f@sha256:9621ef445ef120409e5d95bbd845ab2fa0f613636b59a01d998f5704f4096ae2";
+    DEFAULT_CONTAINER_EGRESS_INTERCEPTOR_IMAGE = "cloudflare/proxy-everything:3f5e832@sha256:816255f5b6ebdc2cdcddb578d803121e7ee9cfe178442da07725d75a66cdcf37";
     __name(getEgressInterceptorImage, "getEgressInterceptorImage");
     __name(pullEgressInterceptorImage, "pullEgressInterceptorImage");
     __name(pullImage, "pullImage");
@@ -43179,6 +43179,10 @@ function flipObject(obj) {
     Object.entries(obj).filter(([_5, v8]) => !!v8).map(([k7, v8]) => [v8, k7])
   );
 }
+function stripQueryString(modulePath) {
+  const queryIndex = modulePath.indexOf("?");
+  return queryIndex !== -1 ? modulePath.slice(0, queryIndex) : modulePath;
+}
 function createModuleCollector(props) {
   const parsedRules = parseRules(props.rules);
   const modules = [];
@@ -43246,16 +43250,17 @@ function createModuleCollector(props) {
                   args.importer
                 )}". This will stop working in the future. Replace references to "${args.path}" with "./${args.path}";`
               );
+              const cleanedPath = stripQueryString(args.path);
               const filePath = path3__namespace.default.join(
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 props.wrangler1xLegacyModuleReferences.rootDirectory,
-                args.path
+                cleanedPath
               );
               const fileContent = await fs12.readFile(
                 filePath
               );
               const fileHash = crypto2__default.default.createHash("sha1").update(fileContent).digest("hex");
-              const fileName = props.preserveFileNames ? args.path : `./${fileHash}-${path3__namespace.default.basename(args.path)}`;
+              const fileName = props.preserveFileNames ? cleanedPath : `./${fileHash}-${path3__namespace.default.basename(cleanedPath)}`;
               const { rule } = rulesMatchers.find(({ regex: regex2 }) => regex2.test(fileName)) || {};
               if (rule) {
                 modules.push({
@@ -43289,15 +43294,16 @@ function createModuleCollector(props) {
                 if (args.pluginData?.skip) {
                   return;
                 }
-                let filePath = path3__namespace.default.join(args.resolveDir, args.path);
+                const cleanedPath = stripQueryString(args.path);
+                let filePath = path3__namespace.default.join(args.resolveDir, cleanedPath);
                 if (foundModulePaths.includes(filePath)) {
-                  return { path: args.path, external: true };
+                  return { path: cleanedPath, external: true };
                 }
                 if (isJavaScriptModuleRule(rule)) {
                   return;
                 }
                 try {
-                  const resolved = await build5.resolve(args.path, {
+                  const resolved = await build5.resolve(cleanedPath, {
                     kind: args.kind,
                     importer: args.importer,
                     resolveDir: args.resolveDir,
@@ -43311,7 +43317,7 @@ function createModuleCollector(props) {
                 } catch {
                 }
                 try {
-                  const resolved = (0, import_resolve.sync)(args.path, {
+                  const resolved = (0, import_resolve.sync)(cleanedPath, {
                     basedir: args.resolveDir
                   });
                   filePath = resolved;
@@ -43321,7 +43327,7 @@ function createModuleCollector(props) {
                   filePath
                 );
                 const fileHash = crypto2__default.default.createHash("sha1").update(fileContent).digest("hex");
-                const fileName = props.preserveFileNames ? args.path : `./${fileHash}-${path3__namespace.default.basename(args.path)}`;
+                const fileName = props.preserveFileNames ? cleanedPath : `./${fileHash}-${path3__namespace.default.basename(cleanedPath)}`;
                 modules.push({
                   name: fileName,
                   filePath,
@@ -43409,6 +43415,7 @@ var init_module_collection = __esm({
       PythonRequirement: "python-requirement"
     };
     ModuleTypeToRuleType = flipObject(RuleTypeToModuleType);
+    __name(stripQueryString, "stripQueryString");
     modulesWatchRegexp = /^wrangler:modules-watch$/;
     modulesWatchNamespace = "wrangler-modules-watch";
     noopModuleCollector = {
@@ -51084,7 +51091,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.70.0";
+    version = "4.72.0";
   }
 });
 
@@ -170042,9 +170049,6 @@ async function executeLocally({
           if (Array.isArray(value)) {
             value = `[${value.join(", ")}]`;
           }
-          if (value === null) {
-            value = "null";
-          }
           return [key, value];
         })
       )
@@ -220851,11 +220855,14 @@ async function patchConfig(config, id, body) {
     }
   );
 }
+var PostgresSslmode, MySqlSslmode;
 var init_client4 = __esm({
   "src/hyperdrive/client.ts"() {
     init_import_meta_url();
     init_cfetch();
     init_user3();
+    PostgresSslmode = ["require", "verify-ca", "verify-full"];
+    MySqlSslmode = ["REQUIRED", "VERIFY_CA", "VERIFY_IDENTITY"];
     __name(createConfig, "createConfig");
     __name(deleteConfig, "deleteConfig");
     __name(getConfig, "getConfig");
@@ -220904,13 +220911,19 @@ var init_shared2 = __esm({
 });
 
 // src/hyperdrive/index.ts
+function normalizeMysqlSslmode(sslmode) {
+  const mysqlSslmode = MySqlSslmode.find(
+    (mode) => mode.toLowerCase() === sslmode.toLowerCase()
+  );
+  return mysqlSslmode ?? sslmode;
+}
 function getOriginFromArgs(allowPartialOrigin, args) {
   if (args.connectionString) {
     const url4 = new URL(args.connectionString);
     url4.protocol = url4.protocol.toLowerCase();
-    if (url4.port === "" && (url4.protocol == "postgresql:" || url4.protocol == "postgres:")) {
+    if (url4.port === "" && (url4.protocol == "postgresql:" || url4.protocol === "postgres:")) {
       url4.port = "5432";
-    } else if (url4.port === "" && url4.protocol == "mysql:") {
+    } else if (url4.port === "" && url4.protocol === "mysql:") {
       url4.port = "3306";
     }
     if (url4.protocol === "") {
@@ -220981,7 +220994,7 @@ function getOriginFromArgs(allowPartialOrigin, args) {
         "You must provide both an Access Client ID and Access Client Secret when configuring Hyperdrive-over-Access"
       );
     }
-    if (!args.originHost || args.originHost == "") {
+    if (!args.originHost || args.originHost === "") {
       throw new UserError(
         "You must provide an origin hostname for the database"
       );
@@ -221033,17 +221046,16 @@ function getMtlsFromArgs(args) {
   const mtls = {
     ca_certificate_id: args.caCertificateId,
     mtls_certificate_id: args.mtlsCertificateId,
-    sslmode: args.sslmode
+    sslmode: args.sslmode ? normalizeMysqlSslmode(args.sslmode) : void 0
   };
   if (JSON.stringify(mtls) === "{}") {
     return void 0;
   } else {
-    if (mtls.sslmode == "require" && mtls.ca_certificate_id?.trim()) {
-      throw new UserError("CA not allowed when sslmode = 'require' is set");
-    }
-    if ((mtls.sslmode == "verify-ca" || mtls.sslmode == "verify-full") && !mtls.ca_certificate_id?.trim()) {
+    if (mtls.sslmode && !PostgresSslmode.includes(mtls.sslmode) && !MySqlSslmode.includes(mtls.sslmode)) {
       throw new UserError(
-        "CA required when sslmode = 'verify-ca' or 'verify-full' is set"
+        `Invalid sslmode '${mtls.sslmode}'. Valid options are:
+- PostgreSQL: ${PostgresSslmode.join(", ")}
+- MySQL: ${MySqlSslmode.join(", ")}`
       );
     }
     return mtls;
@@ -221058,6 +221070,7 @@ var init_hyperdrive2 = __esm({
     init_import_meta_url();
     init_dist();
     init_create_command();
+    init_client4();
     hyperdriveNamespace = createNamespace({
       metadata: {
         description: "\u{1F680} Manage Hyperdrive databases",
@@ -221066,6 +221079,7 @@ var init_hyperdrive2 = __esm({
         category: "Storage & databases"
       }
     });
+    __name(normalizeMysqlSslmode, "normalizeMysqlSslmode");
     upsertOptions = /* @__PURE__ */ __name((defaultOriginScheme = void 0) => ({
       "connection-string": {
         type: "string",
@@ -221158,8 +221172,9 @@ var init_hyperdrive2 = __esm({
       },
       sslmode: {
         type: "string",
-        choices: ["require", "verify-ca", "verify-full"],
-        description: "Sets CA sslmode for connecting to database."
+        coerce: normalizeMysqlSslmode,
+        choices: [...PostgresSslmode, ...MySqlSslmode],
+        description: `Sets sslmode for connecting to database. For PostgreSQL: '${PostgresSslmode.join(", ")}'. For MySQL: '${MySqlSslmode.join(", ")}'.`
       },
       "origin-connection-limit": {
         type: "number",
@@ -229602,7 +229617,6 @@ ${JSON.stringify(defaultRoutesJSONSpec, null, 2)}`
             siteInclude: void 0,
             siteExclude: void 0,
             enableContainers: false,
-            experimentalTailLogs: true,
             types: false
           })
         );
@@ -273053,11 +273067,15 @@ var init_tail2 = __esm({
 });
 
 // src/routes.ts
-async function getWorkersDevSubdomain(complianceConfig, accountId, configPath) {
+async function getWorkersDevSubdomain(complianceConfig, accountId, configPath, apiToken) {
   try {
     const { subdomain } = await fetchResult(
       complianceConfig,
-      `/accounts/${accountId}/workers/subdomain`
+      `/accounts/${accountId}/workers/subdomain`,
+      void 0,
+      void 0,
+      void 0,
+      apiToken
     );
     return `${subdomain}${getComplianceRegionSubdomain(complianceConfig)}.workers.dev`;
   } catch (e9) {
@@ -275978,6 +275996,21 @@ function collectCoreBindingsPerEnvironment(args) {
   }
   __name(collectEnvironmentBindings, "collectEnvironmentBindings");
   const { rawConfig } = exports.experimental_readRawConfig(args);
+  const topLevelInheritableBindings = [];
+  for (const inheritableDef of INHERITABLE_BINDINGS) {
+    const bindingName = inheritableDef.getBindingName(rawConfig);
+    if (!bindingName) {
+      continue;
+    }
+    topLevelInheritableBindings.push({
+      binding: {
+        bindingCategory: inheritableDef.bindingCategory,
+        name: bindingName,
+        type: inheritableDef.type
+      },
+      definition: inheritableDef
+    });
+  }
   const topLevelBindings = collectEnvironmentBindings(
     rawConfig,
     TOP_LEVEL_ENV_NAME
@@ -275987,6 +276020,18 @@ function collectCoreBindingsPerEnvironment(args) {
   }
   for (const [envName, env6] of Object.entries(rawConfig.env ?? {})) {
     const envBindings = collectEnvironmentBindings(env6, envName);
+    for (const inheritable3 of topLevelInheritableBindings) {
+      const alreadyHasBinding = envBindings.some(
+        (b11) => b11.bindingCategory === inheritable3.binding.bindingCategory
+      );
+      if (alreadyHasBinding) {
+        continue;
+      }
+      if (inheritable3.definition.hasProperty(env6)) {
+        continue;
+      }
+      envBindings.push(inheritable3.binding);
+    }
     if (envBindings.length > 0) {
       result.set(envName, envBindings);
     }
@@ -276214,7 +276259,7 @@ function collectPipelinesPerEnvironment(args) {
   }
   return result;
 }
-var typesCommand, validateTypesFile, logHorizontalRule;
+var typesCommand, validateTypesFile, logHorizontalRule, INHERITABLE_BINDINGS;
 var init_type_generation = __esm({
   "src/type-generation/index.ts"() {
     init_import_meta_url();
@@ -276483,6 +276528,14 @@ ${content.join("\n")}`,
       const screenWidth = process.stdout.columns;
       logger.log(source_default.dim("\u2500".repeat(Math.min(screenWidth, 60))));
     }, "logHorizontalRule");
+    INHERITABLE_BINDINGS = [
+      {
+        bindingCategory: "assets",
+        getBindingName: /* @__PURE__ */ __name((env6) => env6?.assets?.binding, "getBindingName"),
+        hasProperty: /* @__PURE__ */ __name((env6) => env6?.assets !== void 0, "hasProperty"),
+        type: "Fetcher"
+      }
+    ];
     __name(collectVarsPerEnvironment, "collectVarsPerEnvironment");
     __name(collectCoreBindingsPerEnvironment, "collectCoreBindingsPerEnvironment");
     __name(collectDurableObjectsPerEnvironment, "collectDurableObjectsPerEnvironment");
@@ -292288,13 +292341,6 @@ var init_dev2 = __esm({
           describe: "Show interactive dev session (defaults to true if the terminal supports interactivity)",
           type: "boolean"
         },
-        "experimental-tail-logs": {
-          type: "boolean",
-          alias: ["x-tail-logs"],
-          describe: "Experimental: Get runtime logs for the remote worker via Workers Tails rather than the Devtools inspector",
-          default: true,
-          hidden: true
-        },
         types: {
           describe: "Generate types from your Worker configuration",
           type: "boolean"
@@ -293186,7 +293232,7 @@ async function resolveTriggers(config, input) {
   })) ?? [];
   return [...devRoutes, ...queueConsumers, ...crons];
 }
-async function resolveConfig(config, input) {
+async function resolveConfig(config, input, previousName) {
   if (config.pages_build_output_dir && input.dev?.multiworkerPrimary === false) {
     throw new UserError(
       `You cannot use a Pages project as a service binding target.
@@ -293219,7 +293265,7 @@ If you are trying to develop Pages and Workers together, please use \`wrangler p
     config
   );
   const resolved = {
-    name: getScriptName({ name: input.name, env: input.env }, config) ?? "worker",
+    name: getScriptName({ name: input.name, env: input.env }, config) ?? previousName ?? crypto.randomUUID(),
     config: config.configPath,
     compatibilityDate: getDevCompatibilityDate(
       entry.projectRoot,
@@ -293274,9 +293320,7 @@ If you are trying to develop Pages and Workers together, please use \`wrangler p
     },
     assets: assetsOptions,
     tailConsumers: config.tail_consumers ?? [],
-    experimental: {
-      tailLogs: !!input.experimental?.tailLogs
-    },
+    experimental: {},
     streamingTailConsumers: config.streaming_tail_consumers ?? []
   };
   if (extractBindingsOfType("analytics_engine", resolved.bindings).length && !resolved.dev.remote && resolved.build.format === "service-worker") {
@@ -293467,7 +293511,7 @@ var init_ConfigController = __esm({
           if (!getDisableConfigWatching()) {
             await this.#ensureWatchingConfig(fileConfig.configPath);
           }
-          const { config: resolvedConfig, printCurrentBindings } = await resolveConfig(fileConfig, input);
+          const { config: resolvedConfig, printCurrentBindings } = await resolveConfig(fileConfig, input, this.latestConfig?.name);
           if (signal.aborted) {
             return;
           }
@@ -294166,12 +294210,11 @@ var init_ProxyController = __esm({
         }
       }
       get inspectorEnabled() {
-        const inVscodeJsDebugTerminal = !!process.env.VSCODE_INSPECTOR_OPTIONS;
-        const shouldEnableInspector = this.latestConfig?.dev.inspector !== false && !inVscodeJsDebugTerminal;
         if (this.latestConfig?.dev.remote) {
-          return shouldEnableInspector && !this.latestConfig?.experimental?.tailLogs;
+          return false;
         }
-        return shouldEnableInspector;
+        const inVscodeJsDebugTerminal = !!process.env.VSCODE_INSPECTOR_OPTIONS;
+        return this.latestConfig?.dev.inspector !== false && !inVscodeJsDebugTerminal;
       }
       // ******************
       //   Event Handlers
@@ -294356,72 +294399,72 @@ var init_ProxyController = __esm({
     __name(didMiniflareOptionsChange, "didMiniflareOptionsChange");
   }
 });
-
-// src/utils/isAbortError.ts
-function isAbortError(err) {
-  const legacyAbortErroCheck = err.code == "ABORT_ERR";
-  const abortErrorCheck = err instanceof Error && err.name == "AbortError";
-  return legacyAbortErroCheck || abortErrorCheck;
-}
-var init_isAbortError = __esm({
-  "src/utils/isAbortError.ts"() {
-    init_import_meta_url();
-    __name(isAbortError, "isAbortError");
-  }
-});
 function switchHost(originalUrl, host, zonePreview) {
   const url4 = new Url.URL(originalUrl);
   url4.hostname = zonePreview ? host ?? url4.hostname : url4.hostname;
   return url4;
 }
-async function createPreviewSession(complianceConfig, account, ctx, abortSignal, tailLogs) {
+async function tryExpandToken(exchangeUrl, ctx, abortSignal) {
+  try {
+    const switchedExchangeUrl = switchHost(exchangeUrl, ctx.host, !!ctx.zone);
+    const headers = {};
+    const accessToken = await getAccessToken(switchedExchangeUrl.hostname);
+    if (accessToken) {
+      headers.cookie = `CF_Authorization=${accessToken}`;
+    }
+    logger.debugWithSanitization(
+      "-- START EXCHANGE API REQUEST:",
+      ` GET ${switchedExchangeUrl.href}`
+    );
+    logger.debug("-- END EXCHANGE API REQUEST");
+    const exchangeResponse = await (0, import_undici26.fetch)(switchedExchangeUrl, {
+      signal: abortSignal,
+      headers
+    });
+    const bodyText = await exchangeResponse.text();
+    logger.debug(
+      "-- START EXCHANGE API RESPONSE:",
+      exchangeResponse.statusText,
+      exchangeResponse.status
+    );
+    logger.debug("HEADERS:", JSON.stringify(exchangeResponse.headers, null, 2));
+    logger.debugWithSanitization("RESPONSE:", bodyText);
+    logger.debug("-- END EXCHANGE API RESPONSE");
+    if (!exchangeResponse.ok) {
+      return null;
+    }
+    const body = parseJSON(bodyText);
+    if (typeof body?.token !== "string") {
+      return null;
+    }
+    return body.token;
+  } catch (e9) {
+    if (e9 instanceof Error && e9.name === "AbortError") {
+      throw e9;
+    }
+    return null;
+  }
+}
+async function createPreviewSession(complianceConfig, account, ctx, abortSignal, name2) {
   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,
-    apiToken
-  );
-  const switchedExchangeUrl = switchHost(exchange_url, ctx.host, !!ctx.zone);
-  const headers = {};
-  const accessToken = await getAccessToken(switchedExchangeUrl.hostname);
-  if (accessToken) {
-    headers.cookie = `CF_Authorization=${accessToken}`;
-  }
-  logger.debugWithSanitization(
-    "-- START EXCHANGE API REQUEST:",
-    ` GET ${switchedExchangeUrl.href}`
-  );
-  logger.debug("-- END EXCHANGE API REQUEST");
-  const exchangeResponse = await (0, import_undici26.fetch)(switchedExchangeUrl, {
-    signal: abortSignal,
-    headers
-  });
-  const bodyText = await exchangeResponse.text();
-  logger.debug(
-    "-- START EXCHANGE API RESPONSE:",
-    exchangeResponse.statusText,
-    exchangeResponse.status
-  );
-  logger.debug("HEADERS:", JSON.stringify(exchangeResponse.headers, null, 2));
-  logger.debugWithSanitization("RESPONSE:", bodyText);
-  logger.debug("-- END EXCHANGE API RESPONSE");
+  const { token, exchange_url } = await fetchResult(complianceConfig, initUrl, void 0, void 0, abortSignal, apiToken);
+  const previewSessionToken = exchange_url ? await tryExpandToken(exchange_url, ctx, abortSignal) ?? token : token;
   try {
-    const { inspector_websocket, prewarm, token } = parseJSON(bodyText);
-    let inspectorUrl;
-    if (!tailLogs) {
-      inspectorUrl = switchHost(inspector_websocket, ctx.host, !!ctx.zone);
-      inspectorUrl.searchParams.append("cf_workers_preview_token", token);
+    let host = ctx.host;
+    if (!host) {
+      const subdomain = await getWorkersDevSubdomain(
+        complianceConfig,
+        account.accountId,
+        void 0,
+        apiToken
+      );
+      host = `${name2 ?? crypto2__default.default.randomUUID()}.${subdomain}`;
     }
     return {
-      id: crypto2__default.default.randomUUID(),
-      value: token,
-      host: ctx.host ?? inspectorUrl?.host ?? switchedExchangeUrl.host,
-      prewarmUrl: switchHost(prewarm, ctx.host, !!ctx.zone),
-      inspectorUrl
+      value: previewSessionToken,
+      host,
+      name: name2
     };
   } catch (e9) {
     if (!(e9 instanceof ParseError)) {
@@ -294434,7 +294477,7 @@ async function createPreviewSession(complianceConfig, account, ctx, abortSignal,
   }
 }
 async function createPreviewToken(complianceConfig, account, worker, ctx, session, abortSignal, minimal_mode) {
-  const { value, host, inspectorUrl, prewarmUrl } = session;
+  const { value, host } = session;
   const { accountId } = account;
   const url4 = ctx.env && ctx.useServiceEnvironments ? `/accounts/${accountId}/workers/services/${worker.name}/environments/${ctx.env}/edge-preview` : `/accounts/${accountId}/workers/scripts/${worker.name}/edge-preview`;
   const mode = ctx.zone ? {
@@ -294472,9 +294515,7 @@ async function createPreviewToken(complianceConfig, account, worker, ctx, sessio
   );
   return {
     value: preview_token,
-    host: ctx.host ?? (worker.name ? `${worker.name}.${host.split(".").slice(1).join(".")}` : host),
-    inspectorUrl,
-    prewarmUrl,
+    host,
     tailUrl: tail_url
   };
 }
@@ -294488,27 +294529,6 @@ async function createWorkerPreview(complianceConfig, init4, account, ctx, sessio
     abortSignal,
     minimal_mode
   );
-  const accessToken = await getAccessToken(token.prewarmUrl.hostname);
-  const headers = { "cf-workers-preview-token": token.value };
-  if (accessToken) {
-    headers.cookie = `CF_Authorization=${accessToken}`;
-  }
-  (0, import_undici26.fetch)(token.prewarmUrl.href, {
-    method: "POST",
-    signal: abortSignal,
-    headers
-  }).then(
-    (response) => {
-      if (!response.ok) {
-        logger.warn("worker failed to prewarm: ", response.statusText);
-      }
-    },
-    (err) => {
-      if (isAbortError(err)) {
-        logger.warn("worker failed to prewarm: ", err);
-      }
-    }
-  );
   return token;
 }
 var import_undici26;
@@ -294520,14 +294540,28 @@ var init_create_worker_preview = __esm({
     init_cfetch();
     init_create_worker_upload_form();
     init_logger();
+    init_routes6();
     init_access();
-    init_isAbortError();
     __name(switchHost, "switchHost");
+    __name(tryExpandToken, "tryExpandToken");
     __name(createPreviewSession, "createPreviewSession");
     __name(createPreviewToken, "createPreviewToken");
     __name(createWorkerPreview, "createWorkerPreview");
   }
 });
+
+// src/utils/isAbortError.ts
+function isAbortError(err) {
+  const legacyAbortErroCheck = err.code == "ABORT_ERR";
+  const abortErrorCheck = err instanceof Error && err.name == "AbortError";
+  return legacyAbortErroCheck || abortErrorCheck;
+}
+var init_isAbortError = __esm({
+  "src/utils/isAbortError.ts"() {
+    init_import_meta_url();
+    __name(isAbortError, "isAbortError");
+  }
+});
 function handlePreviewSessionUploadError(err, accountId) {
   assert51__default.default(err && typeof err === "object");
   if (!isAbortError(err)) {
@@ -294757,7 +294791,7 @@ var init_RemoteRuntimeController = __esm({
             workerAccount,
             workerContext,
             this.#abortController.signal,
-            props.tail_logs
+            props.name
           );
         } catch (err) {
           if (err instanceof Error && err.name == "AbortError") {
@@ -294781,6 +294815,9 @@ var init_RemoteRuntimeController = __esm({
           if (props.bundleId !== this.#currentBundleId) {
             return;
           }
+          this.#activeTail?.removeAllListeners("error");
+          this.#activeTail?.on("error", () => {
+          });
           this.#activeTail?.terminate();
           const { workerAccount, workerContext } = await getWorkerAccountAndContext(
             {
@@ -294794,7 +294831,6 @@ var init_RemoteRuntimeController = __esm({
               configPath: props.configPath
             }
           );
-          const scriptId = props.name || (workerContext.zone ? this.#session.id : this.#session.host.split(".")[0]);
           if (props.bundleId !== this.#currentBundleId) {
             return;
           }
@@ -294803,7 +294839,7 @@ var init_RemoteRuntimeController = __esm({
             bundle: props.bundle,
             modules: props.modules,
             accountId: props.accountId,
-            name: scriptId,
+            name: props.name,
             useServiceEnvironments: props.useServiceEnvironments,
             env: props.env,
             isWorkersSite: props.isWorkersSite,
@@ -294826,7 +294862,7 @@ var init_RemoteRuntimeController = __esm({
             this.#abortController.signal,
             props.minimal_mode
           );
-          if (props.tail_logs && workerPreviewToken.tailUrl) {
+          if (workerPreviewToken.tailUrl) {
             this.#activeTail = new import_websocket.default(
               workerPreviewToken.tailUrl,
               TRACE_VERSION,
@@ -294874,7 +294910,7 @@ var init_RemoteRuntimeController = __esm({
           routes,
           sendMetrics: config.sendMetrics,
           configPath: config.config,
-          tail_logs: !!config.experimental?.tailLogs
+          name: config.name
         });
       }
       #extractRoutes(config) {
@@ -294918,8 +294954,7 @@ var init_RemoteRuntimeController = __esm({
           sendMetrics: config.sendMetrics,
           configPath: config.config,
           bundleId,
-          minimal_mode: config.dev.remote === "minimal",
-          tail_logs: !!config.experimental?.tailLogs
+          minimal_mode: config.dev.remote === "minimal"
         });
         if (bundleId !== this.#currentBundleId || !token) {
           return;
@@ -294935,14 +294970,6 @@ var init_RemoteRuntimeController = __esm({
               hostname: token.host,
               port: "443"
             },
-            ...!config.experimental?.tailLogs && token.inspectorUrl ? {
-              userWorkerInspectorUrl: {
-                protocol: token.inspectorUrl.protocol,
-                hostname: token.inspectorUrl.hostname,
-                port: token.inspectorUrl.port.toString(),
-                pathname: token.inspectorUrl.pathname
-              }
-            } : {},
             headers: {
               "cf-workers-preview-token": token.value,
               ...accessToken ? { Cookie: `CF_Authorization=${accessToken}` } : {},
@@ -294967,6 +294994,9 @@ var init_RemoteRuntimeController = __esm({
           if (this.#session) {
             logger.log(source_default.dim("\u2394 Detected changes, restarted server."));
           }
+          if (this.#session && config.name !== this.#session.name) {
+            this.#session = void 0;
+          }
           this.#session ??= await this.#getPreviewSession(config, auth, routes);
           await this.#updatePreviewToken(config, bundle, auth, routes, id);
         } catch (error2) {
@@ -295057,6 +295087,9 @@ var init_RemoteRuntimeController = __esm({
         logger.debug("RemoteRuntimeController teardown beginning...");
         this.#session = void 0;
         this.#abortController.abort();
+        this.#activeTail?.removeAllListeners("error");
+        this.#activeTail?.on("error", () => {
+        });
         this.#activeTail?.terminate();
         logger.debug("RemoteRuntimeController teardown complete");
       }
@@ -295756,8 +295789,7 @@ var init_LocalRuntimeController = __esm({
                 this.containerBeingBuilt = void 0;
               }, "onContainerImagePreparationEnd"),
               logger,
-              isVite: false,
-              compatibilityFlags: data.config.compatibilityFlags
+              isVite: false
             });
             if (this.containerBeingBuilt) {
               this.containerBeingBuilt.abortRequested = false;
@@ -296023,8 +296055,7 @@ var init_MultiworkerRuntimeController = __esm({
                 this.containerBeingBuilt = void 0;
               }, "onContainerImagePreparationEnd"),
               logger,
-              isVite: false,
-              compatibilityFlags: data.config.compatibilityFlags
+              isVite: false
             });
             if (this.containerBeingBuilt) {
               this.containerBeingBuilt.abortRequested = false;
@@ -296290,7 +296321,7 @@ function registerDevHotKeys(devEnvs, args, render2 = true) {
         keys: ["d"],
         label: "open devtools",
         // Don't display this hotkey if we're in a VSCode debug session
-        disabled: !!process.env.VSCODE_INSPECTOR_OPTIONS || args.remote && args.experimentalTailLogs,
+        disabled: !!process.env.VSCODE_INSPECTOR_OPTIONS || args.remote,
         handler: /* @__PURE__ */ __name(async () => {
           const { inspectorUrl } = await primaryDevEnv.proxy.ready.promise;
           if (!inspectorUrl) {
@@ -298875,10 +298906,7 @@ async function setupDevEnv(devEnv, configPath, auth, args) {
         }, "site"),
         useServiceEnvironments: !(args.legacyEnv ?? true)
       },
-      assets: args.assets,
-      experimental: {
-        tailLogs: !!args.experimentalTailLogs
-      }
+      assets: args.assets
     },
     true
   );
@@ -299057,7 +299085,6 @@ unstable_dev()'s behaviour will likely change in future releases`
     enableContainers: options?.experimental?.enableContainers ?? false,
     dockerPath,
     containerEngine: options?.experimental?.containerEngine,
-    experimentalTailLogs: true,
     types: false
   };
   const devServer = await run(