wrangler 4.20.2 → 4.20.3

package/wrangler-dist/cli.js

@@ -26910,7 +26910,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.20.2";
+    version = "4.20.3";
   }
 });
 
@@ -33963,29 +33963,33 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
   }
   if (workflows !== void 0 && workflows.length > 0) {
     output.push(
-      ...workflows.map(({ class_name, script_name, binding, remote }) => {
-        let value = class_name;
-        if (script_name) {
-          value += ` (defined in ${script_name})`;
+      ...workflows.map(
+        ({ class_name, script_name, binding, experimental_remote }) => {
+          let value = class_name;
+          if (script_name) {
+            value += ` (defined in ${script_name})`;
+          }
+          return {
+            name: binding,
+            type: friendlyBindingNames.workflows,
+            value,
+            mode: getMode({
+              isSimulatedLocally: script_name ? !experimental_remote : true
+            })
+          };
         }
-        return {
-          name: binding,
-          type: friendlyBindingNames.workflows,
-          value,
-          mode: getMode({ isSimulatedLocally: script_name ? !remote : true })
-        };
-      })
+      )
     );
   }
   if (kv_namespaces !== void 0 && kv_namespaces.length > 0) {
     output.push(
-      ...kv_namespaces.map(({ binding, id, remote }) => {
+      ...kv_namespaces.map(({ binding, id, experimental_remote }) => {
         return {
           name: binding,
           type: friendlyBindingNames.kv_namespaces,
           value: id,
           mode: getMode({
-            isSimulatedLocally: !remote
+            isSimulatedLocally: !experimental_remote
           })
         };
       })
@@ -34007,13 +34011,13 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
   }
   if (queues !== void 0 && queues.length > 0) {
     output.push(
-      ...queues.map(({ binding, queue_name, remote }) => {
+      ...queues.map(({ binding, queue_name, experimental_remote }) => {
         return {
           name: binding,
           type: friendlyBindingNames.queues,
           value: queue_name,
           mode: getMode({
-            isSimulatedLocally: !remote
+            isSimulatedLocally: !experimental_remote
           })
         };
       })
@@ -34027,14 +34031,14 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
           database_name,
           database_id,
           preview_database_id,
-          remote
+          experimental_remote
         }) => {
           const value = typeof database_id == "symbol" ? database_id : preview_database_id ?? database_name ?? database_id;
           return {
             name: binding,
             type: friendlyBindingNames.d1_databases,
             mode: getMode({
-              isSimulatedLocally: !remote
+              isSimulatedLocally: !experimental_remote
             }),
             value
           };
@@ -34044,13 +34048,13 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
   }
   if (vectorize !== void 0 && vectorize.length > 0) {
     output.push(
-      ...vectorize.map(({ binding, index_name, remote }) => {
+      ...vectorize.map(({ binding, index_name, experimental_remote }) => {
         return {
           name: binding,
           type: friendlyBindingNames.vectorize,
           value: index_name,
           mode: getMode({
-            isSimulatedLocally: getFlag("MIXED_MODE") ? remote ? false : void 0 : context2.vectorizeBindToProd ? false : (
+            isSimulatedLocally: getFlag("REMOTE_BINDINGS") ? experimental_remote ? false : void 0 : context2.vectorizeBindToProd ? false : (
               /* Vectorize doesn't support local mode */
               void 0
             )
@@ -34073,17 +34077,19 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
   }
   if (r2_buckets !== void 0 && r2_buckets.length > 0) {
     output.push(
-      ...r2_buckets.map(({ binding, bucket_name, jurisdiction, remote }) => {
-        const value = typeof bucket_name === "symbol" ? bucket_name : bucket_name ? `${bucket_name}${jurisdiction ? ` (${jurisdiction})` : ""}` : void 0;
-        return {
-          name: binding,
-          type: friendlyBindingNames.r2_buckets,
-          value,
-          mode: getMode({
-            isSimulatedLocally: !remote
-          })
-        };
-      })
+      ...r2_buckets.map(
+        ({ binding, bucket_name, jurisdiction, experimental_remote }) => {
+          const value = typeof bucket_name === "symbol" ? bucket_name : bucket_name ? `${bucket_name}${jurisdiction ? ` (${jurisdiction})` : ""}` : void 0;
+          return {
+            name: binding,
+            type: friendlyBindingNames.r2_buckets,
+            value,
+            mode: getMode({
+              isSimulatedLocally: !experimental_remote
+            })
+          };
+        }
+      )
     );
   }
   if (logfwdr !== void 0 && logfwdr.bindings.length > 0) {
@@ -34124,30 +34130,32 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
   }
   if (services !== void 0 && services.length > 0) {
     output.push(
-      ...services.map(({ binding, service, entrypoint, remote }) => {
-        let value = service;
-        let mode = void 0;
-        if (entrypoint) {
-          value += `#${entrypoint}`;
-        }
-        if (remote) {
-          mode = getMode({ isSimulatedLocally: false });
-        } else if (context2.local && context2.registry !== null) {
-          const registryDefinition = context2.registry?.[service];
-          hasConnectionStatus = true;
-          if (registryDefinition && (!entrypoint || registryDefinition.entrypointAddresses?.[entrypoint])) {
-            mode = getMode({ isSimulatedLocally: true, connected: true });
-          } else {
-            mode = getMode({ isSimulatedLocally: true, connected: false });
+      ...services.map(
+        ({ binding, service, entrypoint, experimental_remote }) => {
+          let value = service;
+          let mode = void 0;
+          if (entrypoint) {
+            value += `#${entrypoint}`;
+          }
+          if (experimental_remote) {
+            mode = getMode({ isSimulatedLocally: false });
+          } else if (context2.local && context2.registry !== null) {
+            const registryDefinition = context2.registry?.[service];
+            hasConnectionStatus = true;
+            if (registryDefinition && (!entrypoint || registryDefinition.entrypointAddresses?.[entrypoint])) {
+              mode = getMode({ isSimulatedLocally: true, connected: true });
+            } else {
+              mode = getMode({ isSimulatedLocally: true, connected: false });
+            }
           }
+          return {
+            name: binding,
+            type: friendlyBindingNames.services,
+            value,
+            mode
+          };
         }
-        return {
-          name: binding,
-          type: friendlyBindingNames.services,
-          value,
-          mode
-        };
-      })
+      )
     );
   }
   if (analytics_engine_datasets !== void 0 && analytics_engine_datasets.length > 0) {
@@ -34178,7 +34186,7 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
       type: friendlyBindingNames.browser,
       value: void 0,
       mode: getMode({
-        isSimulatedLocally: getFlag("MIXED_MODE") && browser.remote ? false : void 0
+        isSimulatedLocally: getFlag("REMOTE_BINDINGS") && browser.experimental_remote ? false : void 0
       })
     });
   }
@@ -34188,7 +34196,7 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
       type: friendlyBindingNames.images,
       value: void 0,
       mode: getMode({
-        isSimulatedLocally: getFlag("MIXED_MODE") ? images.remote === true || images.remote === void 0 ? false : void 0 : !!context2.imagesLocalMode
+        isSimulatedLocally: getFlag("REMOTE_BINDINGS") ? images.experimental_remote === true || images.experimental_remote === void 0 ? false : void 0 : !!context2.imagesLocalMode
       })
     });
   }
@@ -34198,7 +34206,7 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
       type: friendlyBindingNames.ai,
       value: ai2.staging ? `staging` : void 0,
       mode: getMode({
-        isSimulatedLocally: getFlag("MIXED_MODE") ? ai2.remote === true || ai2.remote === void 0 ? false : void 0 : false
+        isSimulatedLocally: getFlag("REMOTE_BINDINGS") ? ai2.experimental_remote === true || ai2.experimental_remote === void 0 ? false : void 0 : false
       })
     });
   }
@@ -34270,30 +34278,34 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
   }
   if (dispatch_namespaces !== void 0 && dispatch_namespaces.length > 0) {
     output.push(
-      ...dispatch_namespaces.map(({ binding, namespace, outbound, remote }) => {
-        return {
-          name: binding,
-          type: friendlyBindingNames.dispatch_namespaces,
-          value: outbound ? `${namespace} (outbound -> ${outbound.service})` : namespace,
-          mode: getMode({
-            isSimulatedLocally: getFlag("MIXED_MODE") ? remote ? false : void 0 : void 0
-          })
-        };
-      })
+      ...dispatch_namespaces.map(
+        ({ binding, namespace, outbound, experimental_remote }) => {
+          return {
+            name: binding,
+            type: friendlyBindingNames.dispatch_namespaces,
+            value: outbound ? `${namespace} (outbound -> ${outbound.service})` : namespace,
+            mode: getMode({
+              isSimulatedLocally: getFlag("REMOTE_BINDINGS") ? experimental_remote ? false : void 0 : void 0
+            })
+          };
+        }
+      )
     );
   }
   if (mtls_certificates !== void 0 && mtls_certificates.length > 0) {
     output.push(
-      ...mtls_certificates.map(({ binding, certificate_id, remote }) => {
-        return {
-          name: binding,
-          type: friendlyBindingNames.mtls_certificates,
-          value: certificate_id,
-          mode: getMode({
-            isSimulatedLocally: getFlag("MIXED_MODE") ? remote === true || remote === void 0 ? false : void 0 : false
-          })
-        };
-      })
+      ...mtls_certificates.map(
+        ({ binding, certificate_id, experimental_remote }) => {
+          return {
+            name: binding,
+            type: friendlyBindingNames.mtls_certificates,
+            value: certificate_id,
+            mode: getMode({
+              isSimulatedLocally: getFlag("REMOTE_BINDINGS") ? experimental_remote === true || experimental_remote === void 0 ? false : void 0 : false
+            })
+          };
+        }
+      )
     );
   }
   if (unsafe?.metadata !== void 0) {
@@ -34432,17 +34444,17 @@ function warnOrError(type, remote, supports2) {
   }
   if (remote === false && supports2 === "remote") {
     throw new UserError(
-      `${friendlyBindingNames[type]} bindings do not support local development. You may be able to set \`remote: true\` for the binding definition in your configuration file to access a remote version of the resource.`
+      `${friendlyBindingNames[type]} bindings do not support local development. You may be able to set \`experimental_remote: true\` for the binding definition in your configuration file to access a remote version of the resource.`
     );
   }
   if (remote === void 0 && supports2 === "remote") {
     logger.warn(
-      `${friendlyBindingNames[type]} bindings do not support local development, and so parts of your Worker may not work correctly. You may be able to set \`remote: true\` for the binding definition in your configuration file to access a remote version of the resource.`
+      `${friendlyBindingNames[type]} bindings do not support local development, and so parts of your Worker may not work correctly. You may be able to set \`experimental_remote: true\` for the binding definition in your configuration file to access a remote version of the resource.`
     );
   }
   if (remote === void 0 && supports2 === "always-remote") {
     logger.warn(
-      `${friendlyBindingNames[type]} bindings always access remote resources, and so may incur usage charges even in local dev. To suppress this warning, set \`remote: true\` for the binding definition in your configuration file.`
+      `${friendlyBindingNames[type]} bindings always access remote resources, and so may incur usage charges even in local dev. To suppress this warning, set \`experimental_remote: true\` for the binding definition in your configuration file.`
     );
   }
 }
@@ -36119,12 +36131,12 @@ function warnIfDurableObjectsHaveNoMigrations(diagnostics, durableObjects, migra
   }
 }
 function isRemoteValid(targetObject, fieldPath, diagnostics) {
-  if (!getFlag("MIXED_MODE")) {
+  if (!getFlag("REMOTE_BINDINGS")) {
     return true;
   }
-  if (!isOptionalProperty(targetObject, "remote", "boolean")) {
+  if (!isOptionalProperty(targetObject, "experimental_remote", "boolean")) {
     diagnostics.errors.push(
-      `"${fieldPath}" should, optionally, have a boolean "remote" field but got ${JSON.stringify(
+      `"${fieldPath}" should, optionally, have a boolean "experimental_remote" field but got ${JSON.stringify(
         targetObject
       )}.`
     );
@@ -36712,7 +36724,7 @@ Please add a binding for each to "${fieldPath}.bindings":
       }
       validateAdditionalProperties(diagnostics, field, Object.keys(value), [
         "binding",
-        ...getFlag("MIXED_MODE") ? ["remote"] : []
+        ...getFlag("REMOTE_BINDINGS") ? ["experimental_remote"] : []
       ]);
       return isValid2;
     }, "validateNamedSimpleBinding");
@@ -36983,7 +36995,7 @@ Please add a binding for "${configBindingName}" to "env.${envName}.${field}.bind
         "binding",
         "id",
         "preview_id",
-        ...getFlag("MIXED_MODE") ? ["remote"] : []
+        ...getFlag("REMOTE_BINDINGS") ? ["experimental_remote"] : []
       ]);
       return isValid2;
     }, "validateKVBinding");
@@ -37046,7 +37058,7 @@ Please add a binding for "${configBindingName}" to "env.${envName}.${field}.bind
         "binding",
         "queue",
         "delivery_delay",
-        ...getFlag("MIXED_MODE") ? ["remote"] : []
+        ...getFlag("REMOTE_BINDINGS") ? ["experimental_remote"] : []
       ])) {
         return false;
       }
@@ -37143,7 +37155,7 @@ Please add a binding for "${configBindingName}" to "env.${envName}.${field}.bind
         "bucket_name",
         "preview_bucket_name",
         "jurisdiction",
-        ...getFlag("MIXED_MODE") ? ["remote"] : []
+        ...getFlag("REMOTE_BINDINGS") ? ["experimental_remote"] : []
       ]);
       return isValid2;
     }, "validateR2Binding");
@@ -37196,7 +37208,7 @@ Please add a binding for "${configBindingName}" to "env.${envName}.${field}.bind
         "migrations_dir",
         "migrations_table",
         "preview_database_id",
-        ...getFlag("MIXED_MODE") ? ["remote"] : []
+        ...getFlag("REMOTE_BINDINGS") ? ["experimental_remote"] : []
       ]);
       return isValid2;
     }, "validateD1Binding");
@@ -37230,7 +37242,7 @@ Please add a binding for "${configBindingName}" to "env.${envName}.${field}.bind
       validateAdditionalProperties(diagnostics, field, Object.keys(value), [
         "binding",
         "index_name",
-        ...getFlag("MIXED_MODE") ? ["remote"] : []
+        ...getFlag("REMOTE_BINDINGS") ? ["experimental_remote"] : []
       ]);
       return isValid2;
     }, "validateVectorizeBinding");
@@ -37470,7 +37482,7 @@ ${resolution}`);
       validateAdditionalProperties(diagnostics, field, Object.keys(value), [
         "binding",
         "certificate_id",
-        ...getFlag("MIXED_MODE") ? ["remote"] : []
+        ...getFlag("REMOTE_BINDINGS") ? ["experimental_remote"] : []
       ]);
       if (!isRemoteValid(value, field, diagnostics)) {
         isValid2 = false;
@@ -38093,7 +38105,7 @@ function readConfig(args, options = {}) {
     {
       RESOURCES_PROVISION: getFlag("RESOURCES_PROVISION") ?? false,
       MULTIWORKER: getFlag("MULTIWORKER") ?? false,
-      MIXED_MODE: options.experimental?.mixedModeEnabled ?? getFlag("MIXED_MODE") ?? false
+      REMOTE_BINDINGS: options.experimental?.remoteBindingsEnabled ?? getFlag("REMOTE_BINDINGS") ?? false
     },
     () => {
       return normalizeAndValidateConfig(
@@ -51462,37 +51474,42 @@ async function buildSourceOptions(config) {
 function getRemoteId(id) {
   return typeof id === "string" ? id : null;
 }
-function kvNamespaceEntry({ binding, id: originalId, remote }, mixedModeConnectionString) {
+function kvNamespaceEntry({ binding, id: originalId, experimental_remote }, remoteProxyConnectionString) {
   const id = getRemoteId(originalId) ?? binding;
-  if (!mixedModeConnectionString || !remote) {
+  if (!remoteProxyConnectionString || !experimental_remote) {
     return [binding, { id }];
   }
-  return [binding, { id, mixedModeConnectionString }];
+  return [binding, { id, remoteProxyConnectionString }];
 }
-function r2BucketEntry({ binding, bucket_name, remote }, mixedModeConnectionString) {
+function r2BucketEntry({ binding, bucket_name, experimental_remote }, remoteProxyConnectionString) {
   const id = getRemoteId(bucket_name) ?? binding;
-  if (!mixedModeConnectionString || !remote) {
+  if (!remoteProxyConnectionString || !experimental_remote) {
     return [binding, { id }];
   }
-  return [binding, { id, mixedModeConnectionString }];
+  return [binding, { id, remoteProxyConnectionString }];
 }
-function d1DatabaseEntry({ binding, database_id, preview_database_id, remote }, mixedModeConnectionString) {
+function d1DatabaseEntry({
+  binding,
+  database_id,
+  preview_database_id,
+  experimental_remote
+}, remoteProxyConnectionString) {
   const id = getRemoteId(preview_database_id ?? database_id) ?? binding;
-  if (!mixedModeConnectionString || !remote) {
+  if (!remoteProxyConnectionString || !experimental_remote) {
     return [binding, { id }];
   }
-  return [binding, { id, mixedModeConnectionString }];
+  return [binding, { id, remoteProxyConnectionString }];
 }
 function queueProducerEntry({
   binding,
   queue_name: queueName,
   delivery_delay: deliveryDelay,
-  remote
-}, mixedModeConnectionString) {
-  if (!mixedModeConnectionString || !remote) {
+  experimental_remote
+}, remoteProxyConnectionString) {
+  if (!remoteProxyConnectionString || !experimental_remote) {
     return [binding, { queueName, deliveryDelay }];
   }
-  return [binding, { queueName, deliveryDelay, mixedModeConnectionString }];
+  return [binding, { queueName, deliveryDelay, remoteProxyConnectionString }];
 }
 function pipelineEntry(pipeline) {
   return [pipeline.binding, pipeline.pipeline];
@@ -51505,9 +51522,9 @@ function workflowEntry({
   name: name2,
   class_name: className,
   script_name: scriptName,
-  remote
-}, mixedModeConnectionString) {
-  if (!mixedModeConnectionString || !remote) {
+  experimental_remote
+}, remoteProxyConnectionString) {
+  if (!remoteProxyConnectionString || !experimental_remote) {
     return [
       binding,
       {
@@ -51523,15 +51540,15 @@ function workflowEntry({
       name: name2,
       className,
       scriptName,
-      mixedModeConnectionString
+      remoteProxyConnectionString
     }
   ];
 }
-function dispatchNamespaceEntry({ binding, namespace, remote }, mixedModeConnectionString) {
-  if (!mixedModeConnectionString || !remote) {
+function dispatchNamespaceEntry({ binding, namespace, experimental_remote }, remoteProxyConnectionString) {
+  if (!remoteProxyConnectionString || !experimental_remote) {
     return [binding, { namespace }];
   }
-  return [binding, { namespace, mixedModeConnectionString }];
+  return [binding, { namespace, remoteProxyConnectionString }];
 }
 function ratelimitEntry(ratelimit) {
   return [ratelimit.name, ratelimit];
@@ -51546,7 +51563,7 @@ function queueConsumerEntry(consumer) {
   };
   return [consumer.queue, options];
 }
-function buildMiniflareBindingOptions(config, mixedModeConnectionString, mixedModeEnabled) {
+function buildMiniflareBindingOptions(config, remoteProxyConnectionString, remoteBindingsEnabled) {
   const bindings = config.bindings;
   const textBlobBindings = { ...bindings.text_blobs };
   const dataBlobBindings = { ...bindings.data_blobs };
@@ -51569,12 +51586,12 @@ function buildMiniflareBindingOptions(config, mixedModeConnectionString, mixedMo
   };
   const notFoundServices = /* @__PURE__ */ new Set();
   for (const service of config.services ?? []) {
-    if (mixedModeConnectionString && service.remote) {
+    if (remoteProxyConnectionString && service.experimental_remote) {
       serviceBindings[service.binding] = {
         name: service.service,
         props: service.props,
         entrypoint: service.entrypoint,
-        mixedModeConnectionString
+        remoteProxyConnectionString
       };
       continue;
     }
@@ -51731,7 +51748,7 @@ function buildMiniflareBindingOptions(config, mixedModeConnectionString, mixedMo
     });
   }
   const wrappedBindings = {};
-  if (bindings.ai?.binding && !mixedModeEnabled) {
+  if (bindings.ai?.binding && !remoteBindingsEnabled) {
     externalWorkers.push({
       name: `${EXTERNAL_AI_WORKER_NAME}:${config.name}`,
       modules: [
@@ -51751,18 +51768,18 @@ function buildMiniflareBindingOptions(config, mixedModeConnectionString, mixedMo
       scriptName: `${EXTERNAL_AI_WORKER_NAME}:${config.name}`
     };
   }
-  if (bindings.ai && mixedModeEnabled) {
-    warnOrError("ai", bindings.ai.remote, "always-remote");
+  if (bindings.ai && remoteBindingsEnabled) {
+    warnOrError("ai", bindings.ai.experimental_remote, "always-remote");
   }
-  if (bindings.browser && mixedModeEnabled) {
-    warnOrError("browser", bindings.browser.remote, "remote");
+  if (bindings.browser && remoteBindingsEnabled) {
+    warnOrError("browser", bindings.browser.experimental_remote, "remote");
   }
-  if (bindings.mtls_certificates && mixedModeEnabled) {
+  if (bindings.mtls_certificates && remoteBindingsEnabled) {
     for (const mtls of bindings.mtls_certificates) {
-      warnOrError("ai", mtls.remote, "always-remote");
+      warnOrError("ai", mtls.experimental_remote, "always-remote");
     }
   }
-  if (bindings.images?.binding && !config.imagesLocalMode && !mixedModeEnabled) {
+  if (bindings.images?.binding && !config.imagesLocalMode && !remoteBindingsEnabled) {
     externalWorkers.push({
       name: `${EXTERNAL_IMAGES_WORKER_NAME}:${config.name}`,
       modules: [
@@ -51782,7 +51799,7 @@ function buildMiniflareBindingOptions(config, mixedModeConnectionString, mixedMo
       scriptName: `${EXTERNAL_IMAGES_WORKER_NAME}:${config.name}`
     };
   }
-  if (bindings.vectorize && !mixedModeEnabled) {
+  if (bindings.vectorize && !remoteBindingsEnabled) {
     for (const vectorizeBinding of bindings.vectorize) {
       const bindingName = vectorizeBinding.binding;
       const indexName = vectorizeBinding.index_name;
@@ -51821,28 +51838,28 @@ function buildMiniflareBindingOptions(config, mixedModeConnectionString, mixedMo
     textBlobBindings,
     dataBlobBindings,
     wasmBindings,
-    ai: bindings.ai && mixedModeConnectionString ? {
+    ai: bindings.ai && remoteProxyConnectionString ? {
       binding: bindings.ai.binding,
-      mixedModeConnectionString
+      remoteProxyConnectionString
     } : void 0,
     kvNamespaces: Object.fromEntries(
       bindings.kv_namespaces?.map(
-        (kv) => kvNamespaceEntry(kv, mixedModeConnectionString)
+        (kv) => kvNamespaceEntry(kv, remoteProxyConnectionString)
       ) ?? []
     ),
     r2Buckets: Object.fromEntries(
       bindings.r2_buckets?.map(
-        (r22) => r2BucketEntry(r22, mixedModeConnectionString)
+        (r22) => r2BucketEntry(r22, remoteProxyConnectionString)
       ) ?? []
     ),
     d1Databases: Object.fromEntries(
       bindings.d1_databases?.map(
-        (d1) => d1DatabaseEntry(d1, mixedModeConnectionString)
+        (d1) => d1DatabaseEntry(d1, remoteProxyConnectionString)
       ) ?? []
     ),
     queueProducers: Object.fromEntries(
       bindings.queues?.map(
-        (queue) => queueProducerEntry(queue, mixedModeConnectionString)
+        (queue) => queueProducerEntry(queue, remoteProxyConnectionString)
       ) ?? []
     ),
     queueConsumers: Object.fromEntries(
@@ -51860,7 +51877,7 @@ function buildMiniflareBindingOptions(config, mixedModeConnectionString, mixedMo
     ),
     workflows: Object.fromEntries(
       bindings.workflows?.map(
-        (workflow) => workflowEntry(workflow, mixedModeConnectionString)
+        (workflow) => workflowEntry(workflow, remoteProxyConnectionString)
       ) ?? []
     ),
     secretsStoreSecrets: Object.fromEntries(
@@ -51878,36 +51895,40 @@ function buildMiniflareBindingOptions(config, mixedModeConnectionString, mixedMo
     email: {
       send_email: bindings.send_email
     },
-    images: bindings.images && (config.imagesLocalMode || mixedModeEnabled) ? {
+    images: bindings.images && (config.imagesLocalMode || remoteBindingsEnabled) ? {
       binding: bindings.images.binding,
-      mixedModeConnectionString: bindings.images.remote && mixedModeConnectionString ? mixedModeConnectionString : void 0
+      remoteProxyConnectionString: bindings.images.experimental_remote && remoteProxyConnectionString ? remoteProxyConnectionString : void 0
     } : void 0,
-    browserRendering: mixedModeEnabled && mixedModeConnectionString && bindings.browser?.remote ? {
+    browserRendering: remoteBindingsEnabled && remoteProxyConnectionString && bindings.browser?.experimental_remote ? {
       binding: bindings.browser.binding,
-      mixedModeConnectionString
+      remoteProxyConnectionString
     } : void 0,
-    vectorize: mixedModeEnabled && mixedModeConnectionString ? Object.fromEntries(
+    vectorize: remoteBindingsEnabled && remoteProxyConnectionString ? Object.fromEntries(
       bindings.vectorize?.filter((v7) => {
-        warnOrError("vectorize", v7.remote, "remote");
-        return v7.remote;
+        warnOrError("vectorize", v7.experimental_remote, "remote");
+        return v7.experimental_remote;
       }).map((vectorize) => {
         return [
           vectorize.binding,
           {
             index_name: vectorize.index_name,
-            mixedModeConnectionString
+            remoteProxyConnectionString
           }
         ];
       }) ?? []
     ) : void 0,
-    dispatchNamespaces: mixedModeEnabled && mixedModeConnectionString ? Object.fromEntries(
+    dispatchNamespaces: remoteBindingsEnabled && remoteProxyConnectionString ? Object.fromEntries(
       bindings.dispatch_namespaces?.filter((d6) => {
-        warnOrError("dispatch_namespaces", d6.remote, "remote");
-        return d6.remote;
+        warnOrError(
+          "dispatch_namespaces",
+          d6.experimental_remote,
+          "remote"
+        );
+        return d6.experimental_remote;
       }).map(
         (dispatchNamespace) => dispatchNamespaceEntry(
           dispatchNamespace,
-          mixedModeConnectionString
+          remoteProxyConnectionString
         )
       ) ?? []
     ) : void 0,
@@ -51952,14 +51973,18 @@ function buildMiniflareBindingOptions(config, mixedModeConnectionString, mixedMo
     ratelimits: Object.fromEntries(
       bindings.unsafe?.bindings?.filter((b6) => b6.type == "ratelimit").map(ratelimitEntry) ?? []
     ),
-    mtlsCertificates: mixedModeEnabled && mixedModeConnectionString ? Object.fromEntries(
+    mtlsCertificates: remoteBindingsEnabled && remoteProxyConnectionString ? Object.fromEntries(
       bindings.mtls_certificates?.filter((d6) => {
-        warnOrError("mtls_certificates", d6.remote, "remote");
-        return d6.remote;
+        warnOrError(
+          "mtls_certificates",
+          d6.experimental_remote,
+          "remote"
+        );
+        return d6.experimental_remote;
       }).map((mtlsCertificate) => [
         mtlsCertificate.binding,
         {
-          mixedModeConnectionString,
+          remoteProxyConnectionString,
           certificate_id: mtlsCertificate.certificate_id
         }
       ]) ?? []
@@ -52070,7 +52095,7 @@ function handleRuntimeStdio(stdout2, stderr2) {
     }
   });
 }
-async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticationSecret, mixedModeConnectionString, mixedModeEnabled) {
+async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticationSecret, remoteProxyConnectionString, remoteBindingsEnabled) {
   if (config.crons?.length && !config.testScheduled) {
     if (!didWarnMiniflareCronSupport) {
       didWarnMiniflareCronSupport = true;
@@ -52079,7 +52104,7 @@ async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticati
       );
     }
   }
-  if (!mixedModeEnabled) {
+  if (!remoteBindingsEnabled) {
     if (config.bindings.ai) {
       if (!didWarnAiAccountUsage) {
         didWarnAiAccountUsage = true;
@@ -52107,8 +52132,8 @@ async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticati
   const { sourceOptions, entrypointNames } = await buildSourceOptions(config);
   const { bindingOptions, internalObjects, externalWorkers } = buildMiniflareBindingOptions(
     config,
-    mixedModeConnectionString,
-    mixedModeEnabled
+    remoteProxyConnectionString,
+    remoteBindingsEnabled
   );
   const sitesOptions = buildSitesOptions(config);
   const defaultPersistRoot = getDefaultPersistRoot(config.localPersistencePath);
@@ -60213,7 +60238,7 @@ function containerAppToCreateApplication(containerApp, skipDefaults = false) {
     ...containerApp,
     configuration,
     instances: containerApp.instances ?? 0,
-    scheduling_policy: containerApp.scheduling_policy ?? "regional" /* REGIONAL */,
+    scheduling_policy: containerApp.scheduling_policy ?? "default" /* DEFAULT */,
     constraints: {
       ...containerApp.constraints ?? (!skipDefaults ? { tier: 1 } : void 0),
       cities: containerApp.constraints?.cities?.map(
@@ -60404,6 +60429,9 @@ async function apply(args, config) {
       const prevApp = sortObjectRecursive(
         stripUndefined(applicationToCreateApplication(application))
       );
+      if (appConfigNoDefaults.scheduling_policy === void 0) {
+        appConfig.scheduling_policy = prevApp.scheduling_policy;
+      }
       if (prevApp.durable_objects !== void 0 && appConfigNoDefaults.durable_objects !== void 0 && prevApp.durable_objects.namespace_id !== appConfigNoDefaults.durable_objects.namespace_id) {
         throw new UserError(
           `Application "${prevApp.name}" is assigned to durable object ${prevApp.durable_objects.namespace_id}, but a new DO namespace is being assigned to the application,
@@ -78174,7 +78202,7 @@ function createHandler(def, commandName) {
       const experimentalFlags = def.behaviour?.overrideExperimentalFlags ? def.behaviour?.overrideExperimentalFlags(args) : {
         MULTIWORKER: false,
         RESOURCES_PROVISION: args.experimentalProvision ?? false,
-        MIXED_MODE: args.experimentalMixedMode ?? false
+        REMOTE_BINDINGS: args.experimentalRemoteBindings ?? false
       };
       await run(experimentalFlags, () => {
         const config = def.behaviour?.provideConfig ?? true ? readConfig(args, {
@@ -81308,7 +81336,7 @@ var init_deploy3 = __esm({
         overrideExperimentalFlags: /* @__PURE__ */ __name((args) => ({
           MULTIWORKER: false,
           RESOURCES_PROVISION: args.experimentalProvision ?? false,
-          MIXED_MODE: false
+          REMOTE_BINDINGS: false
         }), "overrideExperimentalFlags"),
         warnIfMultipleEnvsConfiguredButNoneSpecified: true
       },
@@ -89976,7 +90004,7 @@ ${JSON.stringify(defaultRoutesJSONSpec, null, 2)}`
           {
             MULTIWORKER: Array.isArray(args.config),
             RESOURCES_PROVISION: false,
-            MIXED_MODE: false
+            REMOTE_BINDINGS: false
           },
           () => startDev({
             script: scriptEntrypoint,
@@ -90039,7 +90067,7 @@ ${JSON.stringify(defaultRoutesJSONSpec, null, 2)}`
             persistTo: args.persistTo,
             logLevel: args.logLevel ?? "log",
             experimentalProvision: void 0,
-            experimentalMixedMode: false,
+            experimentalRemoteBindings: false,
             experimentalVectorizeBindToProd: false,
             experimentalImagesLocalMode: false,
             enableIpc: true,
@@ -137335,9 +137363,9 @@ var init_client9 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/debug@4.4.0_supports-color@9.2.2/node_modules/debug/src/common.js
+// ../../node_modules/.pnpm/debug@4.4.1_supports-color@9.2.2/node_modules/debug/src/common.js
 var require_common2 = __commonJS({
-  "../../node_modules/.pnpm/debug@4.4.0_supports-color@9.2.2/node_modules/debug/src/common.js"(exports2, module3) {
+  "../../node_modules/.pnpm/debug@4.4.1_supports-color@9.2.2/node_modules/debug/src/common.js"(exports2, module3) {
     init_import_meta_url();
     function setup(env6) {
       createDebug.debug = createDebug;
@@ -137443,7 +137471,7 @@ var require_common2 = __commonJS({
         createDebug.namespaces = namespaces;
         createDebug.names = [];
         createDebug.skips = [];
-        const split = (typeof namespaces === "string" ? namespaces : "").trim().replace(" ", ",").split(",").filter(Boolean);
+        const split = (typeof namespaces === "string" ? namespaces : "").trim().replace(/\s+/g, ",").split(",").filter(Boolean);
         for (const ns of split) {
           if (ns[0] === "-") {
             createDebug.skips.push(ns.slice(1));
@@ -137524,9 +137552,9 @@ var require_common2 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/debug@4.4.0_supports-color@9.2.2/node_modules/debug/src/browser.js
+// ../../node_modules/.pnpm/debug@4.4.1_supports-color@9.2.2/node_modules/debug/src/browser.js
 var require_browser2 = __commonJS({
-  "../../node_modules/.pnpm/debug@4.4.0_supports-color@9.2.2/node_modules/debug/src/browser.js"(exports2, module3) {
+  "../../node_modules/.pnpm/debug@4.4.1_supports-color@9.2.2/node_modules/debug/src/browser.js"(exports2, module3) {
     init_import_meta_url();
     exports2.formatArgs = formatArgs;
     exports2.save = save;
@@ -137672,7 +137700,7 @@ var require_browser2 = __commonJS({
     function load() {
       let r7;
       try {
-        r7 = exports2.storage.getItem("debug");
+        r7 = exports2.storage.getItem("debug") || exports2.storage.getItem("DEBUG");
       } catch (error2) {
       }
       if (!r7 && typeof process !== "undefined" && "env" in process) {
@@ -137700,9 +137728,9 @@ var require_browser2 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/debug@4.4.0_supports-color@9.2.2/node_modules/debug/src/node.js
+// ../../node_modules/.pnpm/debug@4.4.1_supports-color@9.2.2/node_modules/debug/src/node.js
 var require_node5 = __commonJS({
-  "../../node_modules/.pnpm/debug@4.4.0_supports-color@9.2.2/node_modules/debug/src/node.js"(exports2, module3) {
+  "../../node_modules/.pnpm/debug@4.4.1_supports-color@9.2.2/node_modules/debug/src/node.js"(exports2, module3) {
     init_import_meta_url();
     var tty3 = require("tty");
     var util5 = require("util");
@@ -137882,9 +137910,9 @@ var require_node5 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/debug@4.4.0_supports-color@9.2.2/node_modules/debug/src/index.js
+// ../../node_modules/.pnpm/debug@4.4.1_supports-color@9.2.2/node_modules/debug/src/index.js
 var require_src4 = __commonJS({
-  "../../node_modules/.pnpm/debug@4.4.0_supports-color@9.2.2/node_modules/debug/src/index.js"(exports2, module3) {
+  "../../node_modules/.pnpm/debug@4.4.1_supports-color@9.2.2/node_modules/debug/src/index.js"(exports2, module3) {
     init_import_meta_url();
     if (typeof process === "undefined" || process.type === "renderer" || process.browser === true || process.__nwjs) {
       module3.exports = require_browser2();
@@ -145943,7 +145971,7 @@ var init_upload2 = __esm({
         overrideExperimentalFlags: /* @__PURE__ */ __name((args) => ({
           MULTIWORKER: false,
           RESOURCES_PROVISION: args.experimentalProvision ?? false,
-          MIXED_MODE: false
+          REMOTE_BINDINGS: false
         }), "overrideExperimentalFlags"),
         warnIfMultipleEnvsConfiguredButNoneSpecified: true
       },
@@ -149999,16 +150027,16 @@ function createCLIParser(argv) {
       log_file_path: debugLogFilepath
     });
     return true;
+  }).option("experimental-remote-bindings", {
+    describe: `Experimental: Enable Remote Bindings`,
+    type: "boolean",
+    hidden: true,
+    alias: ["x-remote-bindings"]
   }).option("experimental-provision", {
     describe: `Experimental: Enable automatic resource provisioning`,
     type: "boolean",
     hidden: true,
     alias: ["x-provision"]
-  }).option("experimental-mixed-mode", {
-    describe: `Experimental: Enable Mixed Mode`,
-    type: "boolean",
-    hidden: true,
-    alias: ["x-mixed-mode"]
   }).epilogue(
     `Please report any issues to ${source_default.hex("#3B818D")(
       "https://github.com/cloudflare/workers-sdk/issues/new/choose"
@@ -153138,7 +153166,7 @@ async function resolveDevConfig(config, input) {
     bindVectorizeToProd: input.dev?.bindVectorizeToProd ?? false,
     multiworkerPrimary: input.dev?.multiworkerPrimary,
     imagesLocalMode: input.dev?.imagesLocalMode ?? false,
-    experimentalMixedMode: input.dev?.experimentalMixedMode ?? getFlag("MIXED_MODE"),
+    experimentalRemoteBindings: input.dev?.experimentalRemoteBindings ?? getFlag("REMOTE_BINDINGS"),
     enableContainers: input.dev?.enableContainers ?? config.dev.enable_containers,
     dockerPath: input.dev?.dockerPath ?? getDockerPath(),
     containerEngine: input.dev?.containerEngine ?? getDockerHost()
@@ -153170,7 +153198,7 @@ async function resolveBindings(config, input) {
         input.bindings
       )?.[0]
     },
-    input.dev?.experimentalMixedMode
+    input.dev?.experimentalRemoteBindings
   );
   const maskedVars = maskVars(bindings, config);
   printBindings(
@@ -153302,7 +153330,7 @@ If you are trying to develop Pages and Workers together, please use \`wrangler p
     assets: assetsOptions,
     tailConsumers: config.tail_consumers ?? []
   };
-  if (extractBindingsOfType("browser", resolved.bindings).length && !resolved.dev.remote && !getFlag("MIXED_MODE")) {
+  if (extractBindingsOfType("browser", resolved.bindings).length && !resolved.dev.remote && !getFlag("REMOTE_BINDINGS")) {
     logger.warn(
       "Browser Rendering is not supported locally. Please use `wrangler dev --remote` instead."
     );
@@ -173461,17 +173489,17 @@ var init_startDevWorker = __esm({
   }
 });
 
-// src/api/mixedMode/index.ts
-var mixedMode_exports = {};
-__export(mixedMode_exports, {
-  maybeStartOrUpdateMixedModeSession: () => maybeStartOrUpdateMixedModeSession,
+// src/api/remoteBindings/index.ts
+var remoteBindings_exports = {};
+__export(remoteBindings_exports, {
+  maybeStartOrUpdateRemoteProxySession: () => maybeStartOrUpdateRemoteProxySession,
   pickRemoteBindings: () => pickRemoteBindings,
-  startMixedModeSession: () => startMixedModeSession
+  startRemoteProxySession: () => startRemoteProxySession
 });
-async function startMixedModeSession(bindings, options) {
+async function startRemoteProxySession(bindings, options) {
   const proxyServerWorkerWranglerConfig = import_node_path63.default.resolve(
     getBasePath(),
-    "templates/mixedMode/proxyServerWorker/wrangler.jsonc"
+    "templates/remoteBindings/proxyServerWorker/wrangler.jsonc"
   );
   const rawBindings = Object.fromEntries(
     Object.entries(bindings ?? {}).map(([key, binding]) => [
@@ -173493,7 +173521,7 @@ async function startMixedModeSession(bindings, options) {
     },
     bindings: rawBindings
   });
-  const mixedModeConnectionString = await worker.url;
+  const remoteProxyConnectionString = await worker.url;
   const updateBindings = /* @__PURE__ */ __name(async (newBindings) => {
     const rawNewBindings = Object.fromEntries(
       Object.entries(newBindings ?? {}).map(([key, binding]) => [
@@ -173505,7 +173533,7 @@ async function startMixedModeSession(bindings, options) {
   }, "updateBindings");
   return {
     ready: worker.ready,
-    mixedModeConnectionString,
+    remoteProxyConnectionString,
     updateBindings,
     dispose: worker.dispose
   };
@@ -173516,11 +173544,11 @@ function pickRemoteBindings(bindings) {
       if (binding.type === "ai") {
         return true;
       }
-      return "remote" in binding && binding["remote"];
+      return "experimental_remote" in binding && binding["experimental_remote"];
     })
   );
 }
-async function maybeStartOrUpdateMixedModeSession(configPathOrWorkerConfig, preExistingMixedModeSessionData) {
+async function maybeStartOrUpdateRemoteProxySession(configPathOrWorkerConfig, preExistingRemoteProxySessionData) {
   if (typeof configPathOrWorkerConfig === "string") {
     const configPath = configPathOrWorkerConfig;
     const config = readConfig({ config: configPath });
@@ -173532,26 +173560,26 @@ async function maybeStartOrUpdateMixedModeSession(configPathOrWorkerConfig, preE
   }
   const workerConfigs = configPathOrWorkerConfig;
   const remoteBindings = pickRemoteBindings(workerConfigs.bindings);
-  let mixedModeSession = preExistingMixedModeSessionData?.session;
+  let remoteProxySession = preExistingRemoteProxySessionData?.session;
   const remoteBindingsAreSameAsBefore = deepStrictEqual(
     remoteBindings,
-    preExistingMixedModeSessionData?.remoteBindings
+    preExistingRemoteProxySessionData?.remoteBindings
   );
   if (!remoteBindingsAreSameAsBefore) {
-    if (!mixedModeSession) {
+    if (!remoteProxySession) {
       if (Object.keys(remoteBindings).length > 0) {
-        mixedModeSession = await startMixedModeSession(remoteBindings);
+        remoteProxySession = await startRemoteProxySession(remoteBindings);
       }
     } else {
-      await mixedModeSession.updateBindings(remoteBindings);
+      await remoteProxySession.updateBindings(remoteBindings);
     }
   }
-  await mixedModeSession?.ready;
-  if (!mixedModeSession) {
+  await remoteProxySession?.ready;
+  if (!remoteProxySession) {
     return null;
   }
   return {
-    session: mixedModeSession,
+    session: remoteProxySession,
     remoteBindings
   };
 }
@@ -173564,8 +173592,8 @@ function deepStrictEqual(source, target) {
   }
 }
 var import_node_assert28, import_node_path63;
-var init_mixedMode = __esm({
-  "src/api/mixedMode/index.ts"() {
+var init_remoteBindings = __esm({
+  "src/api/remoteBindings/index.ts"() {
     init_import_meta_url();
     import_node_assert28 = __toESM(require("assert"));
     import_node_path63 = __toESM(require("path"));
@@ -173573,9 +173601,9 @@ var init_mixedMode = __esm({
     init_config2();
     init_paths();
     init_startDevWorker();
-    __name(startMixedModeSession, "startMixedModeSession");
+    __name(startRemoteProxySession, "startRemoteProxySession");
     __name(pickRemoteBindings, "pickRemoteBindings");
-    __name(maybeStartOrUpdateMixedModeSession, "maybeStartOrUpdateMixedModeSession");
+    __name(maybeStartOrUpdateRemoteProxySession, "maybeStartOrUpdateRemoteProxySession");
     __name(deepStrictEqual, "deepStrictEqual");
   }
 });
@@ -173723,29 +173751,29 @@ var init_LocalRuntimeController = __esm({
       // wrap updates in a mutex, so they're always applied in invocation order.
       #mutex = new import_miniflare26.Mutex();
       #mf;
-      #mixedModeSessionData = null;
+      #remoteProxySessionData = null;
       onBundleStart(_4) {
       }
       async #onBundleComplete(data, id) {
         try {
           const configBundle = await convertToConfigBundle(data);
-          const experimentalMixedMode = data.config.dev.experimentalMixedMode ?? false;
-          if (experimentalMixedMode && !data.config.dev?.remote) {
-            const { maybeStartOrUpdateMixedModeSession: maybeStartOrUpdateMixedModeSession2 } = await Promise.resolve().then(() => (init_mixedMode(), mixedMode_exports));
-            this.#mixedModeSessionData = await maybeStartOrUpdateMixedModeSession2(
+          const experimentalRemoteBindings = data.config.dev.experimentalRemoteBindings ?? false;
+          if (experimentalRemoteBindings && !data.config.dev?.remote) {
+            const { maybeStartOrUpdateRemoteProxySession: maybeStartOrUpdateRemoteProxySession2 } = await Promise.resolve().then(() => (init_remoteBindings(), remoteBindings_exports));
+            this.#remoteProxySessionData = await maybeStartOrUpdateRemoteProxySession2(
               {
                 name: configBundle.name,
                 bindings: convertCfWorkerInitBindingsToBindings(configBundle.bindings) ?? {}
               },
-              this.#mixedModeSessionData ?? null
+              this.#remoteProxySessionData ?? null
             );
           }
           const { options, internalObjects, entrypointNames } = await buildMiniflareOptions(
             this.#log,
             configBundle,
             this.#proxyToUserWorkerAuthenticationSecret,
-            this.#mixedModeSessionData?.session?.mixedModeConnectionString,
-            !!experimentalMixedMode
+            this.#remoteProxySessionData?.session?.remoteProxyConnectionString,
+            !!experimentalRemoteBindings
           );
           options.liveReload = false;
           if (this.#mf === void 0) {
@@ -173831,11 +173859,11 @@ var init_LocalRuntimeController = __esm({
         }
         await this.#mf?.dispose();
         this.#mf = void 0;
-        if (this.#mixedModeSessionData) {
+        if (this.#remoteProxySessionData) {
           logger.log(source_default.dim("\u2394 Shutting down remote connection..."));
         }
-        await this.#mixedModeSessionData?.session?.dispose();
-        this.#mixedModeSessionData = null;
+        await this.#remoteProxySessionData?.session?.dispose();
+        this.#remoteProxySessionData = null;
         logger.debug("LocalRuntimeController teardown complete");
       }, "#teardown");
       async teardown() {
@@ -173914,7 +173942,7 @@ var init_MultiworkerRuntimeController = __esm({
       #mutex = new import_miniflare27.Mutex();
       #mf;
       #options = /* @__PURE__ */ new Map();
-      #mixedModeSessionsData = /* @__PURE__ */ new Map();
+      #remoteProxySessionsData = /* @__PURE__ */ new Map();
       #canStartMiniflare() {
         return [...this.#options.values()].some((o5) => o5.primary) && [...this.#options.values()].length === this.numWorkers;
       }
@@ -173938,27 +173966,27 @@ var init_MultiworkerRuntimeController = __esm({
       async #onBundleComplete(data, id) {
         try {
           const configBundle = await convertToConfigBundle(data);
-          const experimentalMixedMode = data.config.dev.experimentalMixedMode;
-          if (experimentalMixedMode && !data.config.dev?.remote) {
-            const { maybeStartOrUpdateMixedModeSession: maybeStartOrUpdateMixedModeSession2 } = await Promise.resolve().then(() => (init_mixedMode(), mixedMode_exports));
-            const mixedModeSession = await maybeStartOrUpdateMixedModeSession2(
+          const experimentalRemoteBindings = data.config.dev.experimentalRemoteBindings;
+          if (experimentalRemoteBindings && !data.config.dev?.remote) {
+            const { maybeStartOrUpdateRemoteProxySession: maybeStartOrUpdateRemoteProxySession2 } = await Promise.resolve().then(() => (init_remoteBindings(), remoteBindings_exports));
+            const remoteProxySession = await maybeStartOrUpdateRemoteProxySession2(
               {
                 name: configBundle.name,
                 bindings: convertCfWorkerInitBindingsToBindings(configBundle.bindings) ?? {}
               },
-              this.#mixedModeSessionsData.get(data.config.name) ?? null
+              this.#remoteProxySessionsData.get(data.config.name) ?? null
             );
-            this.#mixedModeSessionsData.set(
+            this.#remoteProxySessionsData.set(
               data.config.name,
-              mixedModeSession ?? null
+              remoteProxySession ?? null
             );
           }
           const { options } = await buildMiniflareOptions(
             this.#log,
             await convertToConfigBundle(data),
             this.#proxyToUserWorkerAuthenticationSecret,
-            this.#mixedModeSessionsData.get(data.config.name)?.session?.mixedModeConnectionString,
-            !!experimentalMixedMode
+            this.#remoteProxySessionsData.get(data.config.name)?.session?.remoteProxyConnectionString,
+            !!experimentalRemoteBindings
           );
           this.#options.set(data.config.name, {
             options,
@@ -174049,15 +174077,15 @@ var init_MultiworkerRuntimeController = __esm({
         }
         await this.#mf?.dispose();
         this.#mf = void 0;
-        if (this.#mixedModeSessionsData.size > 0) {
+        if (this.#remoteProxySessionsData.size > 0) {
           logger.log(source_default.dim("\u2394 Shutting down remote connections..."));
         }
         await Promise.all(
-          [...this.#mixedModeSessionsData.values()].map(
-            (mixedModeSessionData) => mixedModeSessionData?.session?.dispose()
+          [...this.#remoteProxySessionsData.values()].map(
+            (remoteProxySessionData) => remoteProxySessionData?.session?.dispose()
           )
         );
-        this.#mixedModeSessionsData.clear();
+        this.#remoteProxySessionsData.clear();
         logger.debug("MultiworkerRuntimeController teardown complete");
       }, "#teardown");
       async teardown() {
@@ -177125,9 +177153,9 @@ function getResolvedSiteAssetPaths(args, configParam) {
     args.siteExclude
   );
 }
-function getBindings2(configParam, env6, local, args, mixedModeEnabled = getFlag("MIXED_MODE")) {
+function getBindings2(configParam, env6, local, args, remoteBindingsEnabled = getFlag("REMOTE_BINDINGS")) {
   const kvConfig = (configParam.kv_namespaces || []).map(
-    ({ binding, preview_id, id, remote }) => {
+    ({ binding, preview_id, id, experimental_remote }) => {
       if (!preview_id && !local) {
         throw new UserError(
           `In development, you should use a separate kv namespace than the one you'd use in production. Please create a new kv namespace with "wrangler kv namespace create <name> --preview" and add its id as preview_id to the kv_namespace "${binding}" in your ${configFileName(configParam.configPath)} file`
@@ -177136,7 +177164,7 @@ function getBindings2(configParam, env6, local, args, mixedModeEnabled = getFlag
       return {
         binding,
         id: preview_id ?? id,
-        remote: mixedModeEnabled && remote
+        experimental_remote: remoteBindingsEnabled && experimental_remote
       };
     }
   );
@@ -177150,7 +177178,7 @@ function getBindings2(configParam, env6, local, args, mixedModeEnabled = getFlag
     if (local) {
       return {
         ...d1Db,
-        remote: mixedModeEnabled && d1Db.remote,
+        experimental_remote: remoteBindingsEnabled && d1Db.experimental_remote,
         database_id
       };
     }
@@ -177168,7 +177196,13 @@ function getBindings2(configParam, env6, local, args, mixedModeEnabled = getFlag
   const d1Args = args.d1Databases || [];
   const mergedD1Bindings = mergeWithOverride(d1Config, d1Args, "binding");
   const r2Config = configParam.r2_buckets?.map(
-    ({ binding, preview_bucket_name, bucket_name, jurisdiction, remote }) => {
+    ({
+      binding,
+      preview_bucket_name,
+      bucket_name,
+      jurisdiction,
+      experimental_remote
+    }) => {
       if (!preview_bucket_name && !local) {
         throw new UserError(
           `In development, you should use a separate r2 bucket than the one you'd use in production. Please create a new r2 bucket with "wrangler r2 bucket create <name>" and add its name as preview_bucket_name to the r2_buckets "${binding}" in your ${configFileName(configParam.configPath)} file`
@@ -177178,7 +177212,7 @@ function getBindings2(configParam, env6, local, args, mixedModeEnabled = getFlag
         binding,
         bucket_name: preview_bucket_name ?? bucket_name,
         jurisdiction,
-        remote: mixedModeEnabled && remote
+        experimental_remote: remoteBindingsEnabled && experimental_remote
       };
     }
   ) || [];
@@ -177190,10 +177224,12 @@ function getBindings2(configParam, env6, local, args, mixedModeEnabled = getFlag
     servicesConfig,
     servicesArgs,
     "binding"
-  ).map((service) => ({
-    ...service,
-    remote: mixedModeEnabled && "remote" in service && !!service.remote
-  }));
+  ).map(
+    (service) => ({
+      ...service,
+      experimental_remote: remoteBindingsEnabled && "experimental_remote" in service && !!service.experimental_remote
+    })
+  );
   const hyperdriveBindings = configParam.hyperdrive.map((hyperdrive) => {
     const connectionStringFromEnv = process.env[`WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_${hyperdrive.binding}`];
     if (local && connectionStringFromEnv === void 0 && hyperdrive.localConnectionString === void 0) {
@@ -177215,7 +177251,7 @@ function getBindings2(configParam, env6, local, args, mixedModeEnabled = getFlag
         binding: queue.binding,
         queue_name: queue.queue,
         delivery_delay: queue.delivery_delay,
-        remote: mixedModeEnabled && queue.remote
+        experimental_remote: remoteBindingsEnabled && queue.experimental_remote
       };
     })
   ];
@@ -177318,7 +177354,7 @@ var init_dev2 = __esm({
         overrideExperimentalFlags: /* @__PURE__ */ __name((args) => ({
           MULTIWORKER: Array.isArray(args.config),
           RESOURCES_PROVISION: args.experimentalProvision ?? false,
-          MIXED_MODE: args.experimentalMixedMode ?? false
+          REMOTE_BINDINGS: args.experimentalRemoteBindings ?? false
         }), "overrideExperimentalFlags")
       },
       metadata: {
@@ -177693,7 +177729,7 @@ unstable_dev()'s behaviour will likely change in future releases`
     logLevel: options?.logLevel ?? defaultLogLevel,
     port: options?.port ?? 0,
     experimentalProvision: void 0,
-    experimentalMixedMode: false,
+    experimentalRemoteBindings: false,
     experimentalVectorizeBindToProd: vectorizeBindToProd ?? false,
     experimentalImagesLocalMode: imagesLocalMode ?? false,
     enableIpc: options?.experimental?.enableIpc,
@@ -177707,7 +177743,7 @@ unstable_dev()'s behaviour will likely change in future releases`
       // TODO: can we make this work?
       MULTIWORKER: false,
       RESOURCES_PROVISION: false,
-      MIXED_MODE: false
+      REMOTE_BINDINGS: false
     },
     () => startDev(devOptions)
   );
@@ -177939,8 +177975,8 @@ async function getPlatformProxy(options = {}) {
     {
       MULTIWORKER: false,
       RESOURCES_PROVISION: false,
-      // TODO: when possible mixed mode should be made available for getPlatformProxy
-      MIXED_MODE: false
+      // TODO: when possible remote bindings should be made available for getPlatformProxy
+      REMOTE_BINDINGS: false
     },
     () => getMiniflareOptionsFromConfig(rawConfig, env6, options)
   );
@@ -178056,20 +178092,20 @@ function unstable_getMiniflareWorkerOptions(configOrConfigPath, env6, options) {
       tails: config.tail_consumers,
       containers: {}
     },
-    options?.mixedModeConnectionString,
-    options?.mixedModeEnabled ?? false
+    options?.remoteProxyConnectionString,
+    options?.remoteBindingsEnabled ?? false
   );
   if (bindings.services !== void 0) {
     bindingOptions.serviceBindings = Object.fromEntries(
       bindings.services.map((binding) => {
         const name2 = binding.service === config.name ? import_miniflare31.kCurrentWorker : binding.service;
-        if (options?.mixedModeConnectionString && binding.remote) {
+        if (options?.remoteProxyConnectionString && binding.experimental_remote) {
           return [
             binding.binding,
             {
               name: name2,
               entrypoint: binding.entrypoint,
-              mixedModeConnectionString: options.mixedModeConnectionString
+              remoteProxyConnectionString: options.remoteProxyConnectionString
             }
           ];
         }
@@ -178161,18 +178197,18 @@ var init_api3 = __esm({
     init_mtls_certificate();
     init_startDevWorker();
     init_integrations4();
-    init_mixedMode();
+    init_remoteBindings();
   }
 });
 
 // src/cli.ts
 var cli_exports2 = {};
 __export(cli_exports2, {
-  experimental_maybeStartOrUpdateMixedModeSession: () => maybeStartOrUpdateMixedModeSession,
+  experimental_maybeStartOrUpdateRemoteProxySession: () => maybeStartOrUpdateRemoteProxySession,
   experimental_patchConfig: () => experimental_patchConfig,
   experimental_pickRemoteBindings: () => pickRemoteBindings,
   experimental_readRawConfig: () => experimental_readRawConfig,
-  experimental_startMixedModeSession: () => startMixedModeSession,
+  experimental_startRemoteProxySession: () => startRemoteProxySession,
   getPlatformProxy: () => getPlatformProxy,
   unstable_DevEnv: () => DevEnv,
   unstable_convertConfigBindingsToStartWorkerBindings: () => convertConfigBindingsToStartWorkerBindings,
@@ -178277,11 +178313,11 @@ var generateASSETSBinding2 = (
 );
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  experimental_maybeStartOrUpdateMixedModeSession,
+  experimental_maybeStartOrUpdateRemoteProxySession,
   experimental_patchConfig,
   experimental_pickRemoteBindings,
   experimental_readRawConfig,
-  experimental_startMixedModeSession,
+  experimental_startRemoteProxySession,
   getPlatformProxy,
   unstable_DevEnv,
   unstable_convertConfigBindingsToStartWorkerBindings,