wrangler 4.17.0 → 4.18.0

package/bin/wrangler.js

@@ -2,7 +2,7 @@
 const { spawn } = require("child_process");
 const path = require("path");
 
-const ERR_NODE_VERSION = "18.0.0";
+const ERR_NODE_VERSION = "20.0.0";
 const MIN_NODE_VERSION = "20.0.0";
 let wranglerProcess;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.17.0",
+  "version": "4.18.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -55,14 +55,14 @@
     "esbuild": "0.25.4",
     "path-to-regexp": "6.3.0",
     "unenv": "2.0.0-rc.17",
-    "workerd": "1.20250523.0",
+    "workerd": "1.20250525.0",
     "@cloudflare/kv-asset-handler": "0.4.0",
-    "miniflare": "4.20250523.0"
+    "miniflare": "4.20250525.0"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
     "@cloudflare/types": "6.18.4",
-    "@cloudflare/workers-types": "^4.20250523.0",
+    "@cloudflare/workers-types": "^4.20250525.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.47.0",
@@ -135,14 +135,14 @@
     "xdg-app-paths": "^8.3.0",
     "xxhash-wasm": "^1.0.1",
     "yargs": "^17.7.2",
+    "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "^0.13.41",
+    "@cloudflare/pages-shared": "^0.13.42",
     "@cloudflare/workers-shared": "0.17.5",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/cli": "1.1.1"
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20250523.0"
+    "@cloudflare/workers-types": "^4.20250525.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {

package/wrangler-dist/cli.d.ts

@@ -329,8 +329,6 @@ declare type Binding = {
 
 declare type BindingOmit<T> = Omit<T, "binding">;
 
-declare type BindingsOpt = NonNullable<StartDevWorkerInput["bindings"]>;
-
 declare interface BlobPropertyBag {
     type?: string
     endings?: 'native' | 'transparent'
@@ -2641,19 +2639,28 @@ declare class ExecutionContext {
     props: any;
 }
 
+export declare type Experimental_ConfigBindingOptions = Pick<Unstable_Config, "ai" | "browser" | "d1_databases" | "dispatch_namespaces" | "durable_objects" | "queues" | "r2_buckets" | "services" | "kv_namespaces" | "mtls_certificates" | "vectorize" | "workflows">;
+
+export declare type Experimental_MixedModeSession = Pick<Worker, "ready" | "dispose"> & {
+    updateBindings: (bindings: StartDevWorkerInput["bindings"]) => Promise<void>;
+    mixedModeConnectionString: MixedModeConnectionString;
+};
+
 export declare const experimental_patchConfig: (configPath: string, patch: Unstable_RawConfig, isArrayInsertion?: boolean) => string;
 
+export declare function experimental_pickRemoteBindings(bindings: Record<string, Binding>): Record<string, Binding>;
+
 export declare const experimental_readRawConfig: (args: ReadConfigCommandArgs, options?: ReadConfigOptions) => {
     rawConfig: Unstable_RawConfig;
     configPath: string | undefined;
     userConfigPath: string | undefined;
 };
 
-export declare function experimental_startMixedModeSession(bindings: BindingsOpt, options?: {
+export declare function experimental_startMixedModeSession(bindings: StartDevWorkerInput["bindings"], options?: {
     auth?: NonNullable<StartDevWorkerInput["dev"]>["auth"];
     /** If running in a non-public compliance region, set this here. */
     complianceRegion?: Unstable_Config["compliance_region"];
-}): Promise<MixedModeSession>;
+}): Promise<Experimental_MixedModeSession>;
 
 declare function fetch_2 (
 input: RequestInfo,
@@ -3028,11 +3035,6 @@ declare interface MIMEType {
 
 declare type MiniflareWorker = Awaited<ReturnType<Miniflare["getWorker"]>>;
 
-declare type MixedModeSession = Pick<Worker, "ready" | "dispose"> & {
-    updateBindings: (bindings: BindingsOpt) => Promise<void>;
-    mixedModeConnectionString: MixedModeConnectionString;
-};
-
 /** A mocked Agent class that implements the Agent API. It allows one to intercept HTTP requests made through undici and return mocked responses instead. */
 declare class MockAgent<TMockAgentOptions extends MockAgent.Options = MockAgent.Options> extends Dispatcher {
     constructor(options?: MockAgent.Options)
@@ -26586,6 +26588,8 @@ export declare interface Unstable_ASSETSBindingsOptions {
  */
 export declare type Unstable_Config = ComputedFields & ConfigFields<DevConfig> & PagesConfigFields & Environment;
 
+export declare function unstable_convertConfigBindingsToStartWorkerBindings(configBindings: Experimental_ConfigBindingOptions): StartDevWorkerOptions["bindings"];
+
 /**
  *  unstable_dev starts a wrangler dev server, and returns a promise that resolves with utility functions to interact with it.
  */
@@ -26696,6 +26700,7 @@ export declare const unstable_generateASSETSBinding: (opts: Unstable_ASSETSBindi
 
 export declare function unstable_getMiniflareWorkerOptions(configPath: string, env?: string, options?: {
     imagesLocalMode?: boolean;
+    mixedModeConnectionString?: MixedModeConnectionString;
     overrides?: {
         assets?: Partial<AssetsOptions>;
     };
@@ -26703,6 +26708,7 @@ export declare function unstable_getMiniflareWorkerOptions(configPath: string, e
 
 export declare function unstable_getMiniflareWorkerOptions(config: Unstable_Config, env?: string, options?: {
     imagesLocalMode?: boolean;
+    mixedModeConnectionString?: MixedModeConnectionString;
     overrides?: {
         assets?: Partial<AssetsOptions>;
     };

package/wrangler-dist/cli.js

@@ -27279,6 +27279,37 @@ function parseNonHyphenedUuid(uuid) {
   uuid_parts.forEach((part) => hyphenated += part + "-");
   return hyphenated.slice(0, 36);
 }
+function parseByteSize(s5, base = void 0) {
+  const match2 = s5.match(
+    /^(\d*\.*\d*)\s*([kKmMgGtTpP]{0,1})([i]{0,1}[bB]{0,1})$/
+  );
+  if (!match2) {
+    return NaN;
+  }
+  const size = match2[1];
+  if (size.length === 0 || isNaN(Number(size))) {
+    return NaN;
+  }
+  const unit = match2[2].toLowerCase();
+  const sizeUnits = {
+    k: 1,
+    m: 2,
+    g: 3,
+    t: 4,
+    p: 5
+  };
+  if (unit.length !== 0 && !(unit in sizeUnits)) {
+    return NaN;
+  }
+  const binary = match2[3].toLowerCase() == "ib";
+  if (binary && unit.length === 0) {
+    return NaN;
+  }
+  const pow = sizeUnits[unit] || 0;
+  return Math.floor(
+    Number(size) * Math.pow(base ?? (binary ? 1024 : 1e3), pow)
+  );
+}
 var fs2, import_node_path5, import_toml, import_esbuild2, ParseError, APIError, TOML_ERROR_NAME, TOML_ERROR_SUFFIX, units;
 var init_parse = __esm({
   "src/parse.ts"() {
@@ -27389,6 +27420,7 @@ var init_parse = __esm({
     };
     __name(parseHumanDuration, "parseHumanDuration");
     __name(parseNonHyphenedUuid, "parseNonHyphenedUuid");
+    __name(parseByteSize, "parseByteSize");
   }
 });
 
@@ -27421,7 +27453,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.17.0";
+    version = "4.18.0";
   }
 });
 
@@ -29535,9 +29567,8 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
     isProvisioning: context2.provisioning,
     isLocalDev: context2.local
   });
-  const truncate4 = /* @__PURE__ */ __name((item) => {
+  const truncate4 = /* @__PURE__ */ __name((item, maxLength = 40) => {
     const s5 = typeof item === "string" ? item : JSON.stringify(item);
-    const maxLength = 40;
     if (s5.length < maxLength) {
       return s5;
     }
@@ -29704,7 +29735,12 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
           name: binding,
           type: friendlyBindingNames.vectorize,
           value: index_name,
-          mode: getMode()
+          mode: getMode({
+            isSimulatedLocally: context2.vectorizeBindToProd ? false : (
+              /* Vectorize doesn't support local mode */
+              void 0
+            )
+          })
         };
       })
     );
@@ -29958,20 +29994,32 @@ function printBindings(bindings, tailConsumers = [], context2 = {}) {
     );
     const maxNameLength = Math.max(...output.map((b6) => b6.name.length));
     const maxTypeLength = Math.max(...output.map((b6) => b6.type.length));
+    const maxModeLength = Math.max(
+      ...output.map((b6) => b6.mode ? stripAnsi2(b6.mode).length : "Mode".length)
+    );
     const hasMode = output.some((b6) => b6.mode);
     const bindingPrefix = `env.`;
     const bindingLength = bindingPrefix.length + maxNameLength + " (".length + maxValueLength + ")".length;
+    const columnGapSpaces = 6;
+    const columnGapSpacesWrapped = 4;
+    const shouldWrap = bindingLength + columnGapSpaces + maxTypeLength + columnGapSpaces + maxModeLength >= process.stdout.columns;
     logger.log(title2);
+    const columnGap = shouldWrap ? " ".repeat(columnGapSpacesWrapped) : " ".repeat(columnGapSpaces);
     logger.log(
-      `${padEndAnsi(dim("Binding"), bindingLength)}      ${padEndAnsi(dim("Resource"), maxTypeLength)}      ${hasMode ? dim("Mode") : ""}`
+      `${padEndAnsi(dim("Binding"), shouldWrap ? bindingPrefix.length + maxNameLength : bindingLength)}${columnGap}${padEndAnsi(dim("Resource"), maxTypeLength)}${columnGap}${hasMode ? dim("Mode") : ""}`
     );
     for (const binding of output) {
+      const bindingValue = dim(
+        typeof binding.value === "symbol" ? source_default.italic("inherited") : binding.value ?? ""
+      );
       const bindingString = padEndAnsi(
-        `${white(`env.${binding.name}`)}${binding.value ? ` (${dim(typeof binding.value === "symbol" ? source_default.italic("inherited") : binding.value ?? "")})` : ""}`,
-        bindingLength
+        `${white(`env.${binding.name}`)}${binding.value && !shouldWrap ? ` (${bindingValue})` : ""}`,
+        shouldWrap ? bindingPrefix.length + maxNameLength : bindingLength
       );
+      const suffix = shouldWrap ? binding.value ? `
+  ${bindingValue}` : "" : "";
       logger.log(
-        `${bindingString}      ${brandColor(binding.type.padEnd(maxTypeLength))}      ${hasMode ? binding.mode : ""}`
+        `${bindingString}${columnGap}${brandColor(binding.type.padEnd(maxTypeLength))}${columnGap}${hasMode ? binding.mode : ""}${suffix}`
       );
     }
     logger.log();
@@ -46929,21 +46977,21 @@ function getRemoteId(id) {
 }
 function kvNamespaceEntry({ binding, id: originalId, remote }, mixedModeConnectionString) {
   const id = getRemoteId(originalId) ?? binding;
-  if (!getFlag("MIXED_MODE") || !remote) {
+  if (!mixedModeConnectionString || !remote) {
     return [binding, { id }];
   }
   return [binding, { id, mixedModeConnectionString }];
 }
 function r2BucketEntry({ binding, bucket_name, remote }, mixedModeConnectionString) {
   const id = getRemoteId(bucket_name) ?? binding;
-  if (!getFlag("MIXED_MODE") || !remote) {
+  if (!mixedModeConnectionString || !remote) {
     return [binding, { id }];
   }
   return [binding, { id, mixedModeConnectionString }];
 }
 function d1DatabaseEntry({ binding, database_id, preview_database_id, remote }, mixedModeConnectionString) {
   const id = getRemoteId(preview_database_id ?? database_id) ?? binding;
-  if (!getFlag("MIXED_MODE") || !remote) {
+  if (!mixedModeConnectionString || !remote) {
     return [binding, { id }];
   }
   return [binding, { id, mixedModeConnectionString }];
@@ -46954,7 +47002,7 @@ function queueProducerEntry({
   delivery_delay: deliveryDelay,
   remote
 }, mixedModeConnectionString) {
-  if (!getFlag("MIXED_MODE") || !remote) {
+  if (!mixedModeConnectionString || !remote) {
     return [binding, { queueName, deliveryDelay }];
   }
   return [binding, { queueName, deliveryDelay, mixedModeConnectionString }];
@@ -46972,7 +47020,7 @@ function workflowEntry({
   script_name: scriptName,
   remote
 }, mixedModeConnectionString) {
-  if (!getFlag("MIXED_MODE") || !remote) {
+  if (!mixedModeConnectionString || !remote) {
     return [
       binding,
       {
@@ -47028,7 +47076,7 @@ function buildMiniflareBindingOptions(config, mixedModeConnectionString) {
   };
   const notFoundServices = /* @__PURE__ */ new Set();
   for (const service of config.services ?? []) {
-    if (getFlag("MIXED_MODE") && service.remote) {
+    if (mixedModeConnectionString && service.remote) {
       serviceBindings[service.binding] = {
         name: service.service,
         props: service.props,
@@ -47184,7 +47232,7 @@ function buildMiniflareBindingOptions(config, mixedModeConnectionString) {
   }
   const wrappedBindings = {};
   if (bindings.ai?.binding) {
-    if (!getFlag("MIXED_MODE")) {
+    if (!mixedModeConnectionString) {
       externalWorkers.push({
         name: `${EXTERNAL_AI_WORKER_NAME}:${config.name}`,
         modules: [
@@ -47264,7 +47312,7 @@ function buildMiniflareBindingOptions(config, mixedModeConnectionString) {
     textBlobBindings,
     dataBlobBindings,
     wasmBindings,
-    ai: bindings.ai && getFlag("MIXED_MODE") && mixedModeConnectionString ? {
+    ai: bindings.ai && mixedModeConnectionString ? {
       binding: bindings.ai.binding,
       mixedModeConnectionString
     } : void 0,
@@ -47802,6 +47850,13 @@ async function getBinaryFileContents(file) {
   }
   return (0, import_promises5.readFile)(file.path);
 }
+function convertConfigBindingsToStartWorkerBindings(configBindings) {
+  const { queues, ...bindings } = configBindings;
+  return convertCfWorkerInitBindingsToBindings({
+    ...bindings,
+    queues: queues.producers?.map((q6) => ({ ...q6, queue_name: q6.queue }))
+  });
+}
 function convertCfWorkerInitBindingsToBindings(inputBindings) {
   const output = {};
   const bindingsIterable = Object.entries(inputBindings);
@@ -48127,6 +48182,7 @@ var init_utils = __esm({
     __name(assertNever, "assertNever");
     __name(unwrapHook, "unwrapHook");
     __name(getBinaryFileContents, "getBinaryFileContents");
+    __name(convertConfigBindingsToStartWorkerBindings, "convertConfigBindingsToStartWorkerBindings");
     __name(convertCfWorkerInitBindingsToBindings, "convertCfWorkerInitBindingsToBindings");
     __name(convertBindingsToCfWorkerInitBindings, "convertBindingsToCfWorkerInitBindings");
     __name(isUnsafeBindingType, "isUnsafeBindingType");
@@ -58544,7 +58600,7 @@ function renderDeploymentConfiguration(action, {
   image,
   location,
   vcpu,
-  memory,
+  memoryMib,
   environmentVariables,
   labels,
   env: env6,
@@ -58567,7 +58623,7 @@ No environment variables added! You can set some under [${env6 ? "env." + env6 +
     ["image", image],
     ["location", idToLocationName(location)],
     ["vCPU", `${vcpu}`],
-    ["memory", memory],
+    ["memory", `${memoryMib} MiB`],
     ["environment variables", environmentVariablesText],
     ["labels", labelsText],
     ...network === void 0 ? [] : [["IPv4", network.assign_ipv4 === "predefined" ? "yes" : "no"]]
@@ -58593,10 +58649,12 @@ function renderDeploymentMutationError(account, err) {
   }
   const details = err.body.details ?? {};
   function renderAccountLimits() {
-    return `${space(2)}${brandColor("Maximum VCPU per deployment")} ${account.limits.vcpu_per_deployment}
-${space(2)}${brandColor("Maximum total VCPU in your account")} ${account.limits.total_vcpu}
-${space(2)}${brandColor("Maximum memory per deployment")} ${account.limits.memory_per_deployment}
-${space(2)}${brandColor("Maximum total memory in your account")} ${account.limits.total_memory}`;
+    return [
+      `${space(2)}${brandColor("Maximum VCPU per deployment")} ${account.limits.vcpu_per_deployment}`,
+      `${space(2)}${brandColor("Maximum total VCPU in your account")} ${account.limits.total_vcpu}`,
+      `${space(2)}${brandColor("Maximum memory per deployment")} ${account.limits.memory_mib_per_deployment} MiB`,
+      `${space(2)}${brandColor("Maximum total memory in your account")} ${account.limits.total_memory_mib} MiB`
+    ].join("\n");
   }
   __name(renderAccountLimits, "renderAccountLimits");
   function renderInvalidInputDetails(inputDetails) {
@@ -58771,6 +58829,14 @@ async function promptForLabels(labels, initiallySelected, allowSkipping) {
   }
   return [];
 }
+function resolveMemory(args, config) {
+  const MiB = 1024 * 1024;
+  const memory = args.memory ?? config.memory;
+  if (memory !== void 0) {
+    return Math.round(parseByteSize(memory, 1024) / MiB);
+  }
+  return void 0;
+}
 var import_promises12, imageRe;
 var init_common = __esm({
   "src/cloudchamber/common.ts"() {
@@ -58787,6 +58853,7 @@ var init_common = __esm({
     init_is_interactive();
     init_logger();
     init_user2();
+    init_parse();
     init_client2();
     init_wrap();
     init_locations();
@@ -58817,6 +58884,7 @@ var init_common = __esm({
     __name(sortLabels, "sortLabels");
     __name(collectLabels, "collectLabels");
     __name(promptForLabels, "promptForLabels");
+    __name(resolveMemory, "resolveMemory");
   }
 });
 
@@ -64848,8 +64916,7 @@ function createWorkerUploadForm(worker) {
         config: assetConfig
       }
     },
-    ...observability && { observability },
-    minimal_mode: worker.minimal_mode
+    ...observability && { observability }
   };
   if (bindings.unsafe?.metadata !== void 0) {
     for (const key of Object.keys(bindings.unsafe.metadata)) {
@@ -74605,7 +74672,7 @@ function createCommandOptionalYargs(yargs) {
     requiresArg: true,
     type: "string",
     demandOption: false,
-    describe: "Amount of memory (GB, MB...) to allocate to this deployment. Ex: 4GB."
+    describe: "Amount of memory (GiB, MiB...) to allocate to this deployment. Ex: 4GiB."
   }).option("ipv4", {
     requiresArg: false,
     type: "boolean",
@@ -74636,6 +74703,7 @@ async function createCommand2(args, config) {
     const keysToAdd = args.allSshKeys ? (await pollSSHKeysUntilCondition(() => true)).map((key) => key.id) : [];
     const useIpv4 = args.ipv4 ?? config.cloudchamber.ipv4;
     const network = useIpv4 === true ? { assign_ipv4: "predefined" /* PREDEFINED */ } : { assign_ipv6: "predefined" /* PREDEFINED */ };
+    const memoryMib = resolveMemory(args, config.cloudchamber);
     const deployment = await DeploymentsService.createDeploymentV2({
       image: body.image,
       location: body.location,
@@ -74643,8 +74711,8 @@ async function createCommand2(args, config) {
       environment_variables: environmentVariables,
       labels,
       vcpu: args.vcpu ?? config.cloudchamber.vcpu,
-      memory: args.memory ?? config.cloudchamber.memory,
-      network
+      network,
+      memory_mib: memoryMib
     });
     console.log(JSON.stringify(deployment, null, 4));
     return;
@@ -74751,12 +74819,13 @@ async function handleCreateCommand(args, config, environmentVariables, labels) {
   );
   const selectedLabels = await promptForLabels(labels, [], false);
   const account = await loadAccount();
+  const memoryMib = resolveMemory(args, config.cloudchamber) ?? account.defaults.memory_mib ?? Math.round(parseByteSize(account.defaults.memory, 1024) / (1024 * 1024));
   renderDeploymentConfiguration("create", {
     image,
     location,
     network,
     vcpu: args.vcpu ?? config.cloudchamber.vcpu ?? account.defaults.vcpus,
-    memory: args.memory ?? config.cloudchamber.memory ?? account.defaults.memory,
+    memoryMib,
     environmentVariables: selectedEnvironmentVariables,
     labels: selectedLabels,
     env: args.env
@@ -74771,7 +74840,7 @@ async function handleCreateCommand(args, config, environmentVariables, labels) {
     return;
   }
   const { start, stop } = spinner();
-  start("Creating your container", "shortly your container will be created");
+  start("Creating your container", "your container will be created shortly");
   const [deployment, err] = await wrap2(
     DeploymentsService.createDeploymentV2({
       image,
@@ -74780,7 +74849,7 @@ async function handleCreateCommand(args, config, environmentVariables, labels) {
       environment_variables: environmentVariables,
       labels,
       vcpu: args.vcpu ?? config.cloudchamber.vcpu,
-      memory: args.memory ?? config.cloudchamber.memory,
+      memory_mib: memoryMib,
       network
     })
   );
@@ -74805,6 +74874,7 @@ var init_create2 = __esm({
     init_args();
     init_colors();
     init_interactive();
+    init_parse();
     init_cli2();
     init_locations2();
     init_client2();
@@ -75836,6 +75906,7 @@ async function modifyCommand(modifyArgs, config) {
       modifyArgs.var
     );
     const labels = collectLabels(modifyArgs.label);
+    const memoryMib = resolveMemory(modifyArgs, config.cloudchamber);
     const deployment = await DeploymentsService.modifyDeploymentV2(
       modifyArgs.deploymentId,
       {
@@ -75845,7 +75916,7 @@ async function modifyCommand(modifyArgs, config) {
         labels,
         ssh_public_key_ids: modifyArgs.sshPublicKeyId,
         vcpu: modifyArgs.vcpu ?? config.cloudchamber.vcpu,
-        memory: modifyArgs.memory ?? config.cloudchamber.memory
+        memory_mib: memoryMib
       }
     );
     console.log(JSON.stringify(deployment, null, 4));
@@ -75933,11 +76004,12 @@ async function handleModifyCommand(args, config) {
     (deployment.labels ?? []).map((v7) => v7.name),
     true
   );
+  const memoryMib = resolveMemory(args, config.cloudchamber);
   renderDeploymentConfiguration("modify", {
     image,
     location: location ?? deployment.location.name,
     vcpu: args.vcpu ?? config.cloudchamber.vcpu ?? deployment.vcpu,
-    memory: args.memory ?? config.cloudchamber.memory ?? deployment.memory,
+    memoryMib: memoryMib ?? deployment.memory_mib,
     env: args.env,
     environmentVariables: selectedEnvironmentVariables !== void 0 ? selectedEnvironmentVariables : deployment.environment_variables,
     // show the existing environment variables if any
@@ -75966,7 +76038,7 @@ async function handleModifyCommand(args, config) {
       environment_variables: selectedEnvironmentVariables,
       labels: selectedLabels,
       vcpu: args.vcpu ?? config.cloudchamber.vcpu,
-      memory: args.memory ?? config.cloudchamber.memory
+      memory_mib: memoryMib
     })
   );
   stop();
@@ -151873,7 +151945,8 @@ async function resolveBindings(config, input) {
       registry: input.dev?.registry,
       local: !input.dev?.remote,
       imagesLocalMode: input.dev?.imagesLocalMode,
-      name: config.name
+      name: config.name,
+      vectorizeBindToProd: input.dev?.bindVectorizeToProd
     }
   );
   return {
@@ -171318,7 +171391,7 @@ async function createPreviewSession(complianceConfig, account, ctx, abortSignal)
     }
   }
 }
-async function createPreviewToken(complianceConfig, account, worker, ctx, session, abortSignal) {
+async function createPreviewToken(complianceConfig, account, worker, ctx, session, abortSignal, minimal_mode) {
   const { value, host, inspectorUrl, prewarmUrl } = session;
   const { accountId } = account;
   const url4 = ctx.env && !ctx.legacyEnv ? `/accounts/${accountId}/workers/services/${worker.name}/environments/${ctx.env}/edge-preview` : `/accounts/${accountId}/workers/scripts/${worker.name}/edge-preview`;
@@ -171337,8 +171410,9 @@ async function createPreviewToken(complianceConfig, account, worker, ctx, sessio
     ) : (
       // if there aren't any patterns, then just match on all routes
       ["*/*"]
-    )
-  } : { workers_dev: true };
+    ),
+    minimal_mode
+  } : { workers_dev: true, minimal_mode };
   const formData = createWorkerUploadForm(worker);
   formData.set("wrangler-session-config", JSON.stringify(mode));
   const { preview_token } = await fetchResult(
@@ -171361,14 +171435,15 @@ async function createPreviewToken(complianceConfig, account, worker, ctx, sessio
     prewarmUrl
   };
 }
-async function createWorkerPreview(complianceConfig, init3, account, ctx, session, abortSignal) {
+async function createWorkerPreview(complianceConfig, init3, account, ctx, session, abortSignal, minimal_mode) {
   const token = await createPreviewToken(
     complianceConfig,
     account,
     init3,
     ctx,
     session,
-    abortSignal
+    abortSignal,
+    minimal_mode
   );
   const accessToken = await getAccessToken(token.prewarmUrl.hostname);
   const headers = { "cf-workers-preview-token": token.value };
@@ -171529,9 +171604,8 @@ async function createRemoteWorkerInit(props) {
     // no tail consumers in dev - TODO revisit?
     limits: void 0,
     // no limits in preview - not supported yet but can be added
-    observability: void 0,
+    observability: void 0
     // no observability in dev,
-    minimal_mode: props.minimal_mode
   };
   return init3;
 }
@@ -171718,8 +171792,7 @@ var init_RemoteRuntimeController = __esm({
             format: props.format,
             bindings: props.bindings,
             compatibilityDate: props.compatibilityDate,
-            compatibilityFlags: props.compatibilityFlags,
-            minimal_mode: props.minimal_mode
+            compatibilityFlags: props.compatibilityFlags
           });
           if (props.bundleId !== this.#currentBundleId) {
             return;
@@ -171730,7 +171803,8 @@ var init_RemoteRuntimeController = __esm({
             workerAccount,
             workerContext,
             this.#session,
-            this.#abortController.signal
+            this.#abortController.signal,
+            props.minimal_mode
           );
           return workerPreviewToken;
         } catch (err) {
@@ -172090,6 +172164,7 @@ var init_startDevWorker = __esm({
   "src/api/startDevWorker/index.ts"() {
     init_import_meta_url();
     init_DevEnv();
+    init_utils();
     init_types12();
     init_events();
     __name(startWorker, "startWorker");
@@ -172099,6 +172174,7 @@ var init_startDevWorker = __esm({
 // src/api/mixedMode/index.ts
 var mixedMode_exports = {};
 __export(mixedMode_exports, {
+  pickRemoteBindings: () => pickRemoteBindings,
   startMixedModeSession: () => startMixedModeSession
 });
 async function startMixedModeSession(bindings, options) {
@@ -172107,7 +172183,7 @@ async function startMixedModeSession(bindings, options) {
     "templates/mixedMode/proxyServerWorker/wrangler.jsonc"
   );
   const rawBindings = Object.fromEntries(
-    Object.entries(bindings).map(([key, binding]) => [
+    Object.entries(bindings ?? {}).map(([key, binding]) => [
       key,
       { ...binding, raw: true }
     ])
@@ -172133,7 +172209,7 @@ async function startMixedModeSession(bindings, options) {
   const mixedModeConnectionString = await worker.url;
   const updateBindings = /* @__PURE__ */ __name(async (newBindings) => {
     const rawNewBindings = Object.fromEntries(
-      Object.entries(newBindings).map(([key, binding]) => [
+      Object.entries(newBindings ?? {}).map(([key, binding]) => [
         key,
         { ...binding, raw: true }
       ])
@@ -172147,6 +172223,16 @@ async function startMixedModeSession(bindings, options) {
     dispose: worker.dispose
   };
 }
+function pickRemoteBindings(bindings) {
+  return Object.fromEntries(
+    Object.entries(bindings ?? {}).filter(([, binding]) => {
+      if (binding.type === "ai") {
+        return true;
+      }
+      return "remote" in binding && binding["remote"];
+    })
+  );
+}
 var import_node_path63;
 var init_mixedMode = __esm({
   "src/api/mixedMode/index.ts"() {
@@ -172156,6 +172242,7 @@ var init_mixedMode = __esm({
     init_paths();
     init_startDevWorker();
     __name(startMixedModeSession, "startMixedModeSession");
+    __name(pickRemoteBindings, "pickRemoteBindings");
   }
 });
 
@@ -172259,30 +172346,20 @@ async function convertToConfigBundle(event) {
   };
 }
 async function maybeStartOrUpdateMixedModeSession(configBundle, mixedModeSession) {
-  const remoteBindings = convertCfWorkerInitBindingsToBindings(
+  const { startMixedModeSession: startMixedModeSession2, pickRemoteBindings: pickRemoteBindings2 } = await Promise.resolve().then(() => (init_mixedMode(), mixedMode_exports));
+  const convertedBindings = convertCfWorkerInitBindingsToBindings(
     configBundle.bindings
   );
-  const convertedRemoteBindings = Object.fromEntries(
-    Object.entries(remoteBindings ?? []).filter(([, binding]) => {
-      if (binding.type === "ai") {
-        return true;
-      }
-      return "remote" in binding && binding["remote"];
-    })
-  );
+  const remoteBindings = pickRemoteBindings2(convertedBindings ?? {});
   if (mixedModeSession === void 0) {
-    const numOfRemoteBindings = Object.keys(
-      convertedRemoteBindings ?? {}
-    ).length;
+    const numOfRemoteBindings = Object.keys(remoteBindings ?? {}).length;
     if (numOfRemoteBindings > 0) {
-      const mixedModeModule = await Promise.resolve().then(() => (init_mixedMode(), mixedMode_exports));
-      mixedModeSession = await mixedModeModule.startMixedModeSession(
-        convertedRemoteBindings,
-        { complianceRegion: configBundle.complianceRegion }
-      );
+      mixedModeSession = await startMixedModeSession2(remoteBindings, {
+        complianceRegion: configBundle.complianceRegion
+      });
     }
   } else {
-    await mixedModeSession.updateBindings(convertedRemoteBindings);
+    await mixedModeSession.updateBindings(remoteBindings);
   }
   await mixedModeSession?.ready;
   return mixedModeSession;
@@ -176238,7 +176315,7 @@ function getResolvedSiteAssetPaths(args, configParam) {
     args.siteExclude
   );
 }
-function getBindings2(configParam, env6, local, args) {
+function getBindings2(configParam, env6, local, args, mixedModeEnabled = getFlag("MIXED_MODE")) {
   const kvConfig = (configParam.kv_namespaces || []).map(
     ({ binding, preview_id, id, remote }) => {
       if (!preview_id && !local) {
@@ -176249,7 +176326,7 @@ function getBindings2(configParam, env6, local, args) {
       return {
         binding,
         id: preview_id ?? id,
-        remote: getFlag("MIXED_MODE") && remote
+        remote: mixedModeEnabled && remote
       };
     }
   );
@@ -176263,7 +176340,7 @@ function getBindings2(configParam, env6, local, args) {
     if (local) {
       return {
         ...d1Db,
-        remote: getFlag("MIXED_MODE") && d1Db.remote,
+        remote: mixedModeEnabled && d1Db.remote,
         database_id
       };
     }
@@ -176291,7 +176368,7 @@ function getBindings2(configParam, env6, local, args) {
         binding,
         bucket_name: preview_bucket_name ?? bucket_name,
         jurisdiction,
-        remote: getFlag("MIXED_MODE") && remote
+        remote: mixedModeEnabled && remote
       };
     }
   ) || [];
@@ -176305,7 +176382,7 @@ function getBindings2(configParam, env6, local, args) {
     "binding"
   ).map((service) => ({
     ...service,
-    remote: getFlag("MIXED_MODE") && "remote" in service && !!service.remote
+    remote: mixedModeEnabled && "remote" in service && !!service.remote
   }));
   const hyperdriveBindings = configParam.hyperdrive.map((hyperdrive) => {
     const connectionStringFromEnv = process.env[`WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_${hyperdrive.binding}`];
@@ -176328,13 +176405,13 @@ function getBindings2(configParam, env6, local, args) {
         binding: queue.binding,
         queue_name: queue.queue,
         delivery_delay: queue.delivery_delay,
-        remote: getFlag("MIXED_MODE") && queue.remote
+        remote: mixedModeEnabled && queue.remote
       };
     })
   ];
   const workflowsConfig = configParam.workflows.map((workflowConfig) => ({
     ...workflowConfig,
-    remote: getFlag("MIXED_MODE") && workflowConfig.remote
+    remote: mixedModeEnabled && workflowConfig.remote
   }));
   const bindings = {
     // top-level fields
@@ -177143,23 +177220,36 @@ function unstable_getMiniflareWorkerOptions(configOrConfigPath, env6, options) {
     include: rule.globs,
     fallthrough: rule.fallthrough
   }));
-  const bindings = getBindings2(config, env6, true, {});
-  const { bindingOptions, externalWorkers } = buildMiniflareBindingOptions({
-    name: config.name,
-    complianceRegion: config.compliance_region,
-    bindings,
-    workerDefinitions: null,
-    queueConsumers: config.queues.consumers,
-    services: [],
-    serviceBindings: {},
-    migrations: config.migrations,
-    imagesLocalMode: !!options?.imagesLocalMode,
-    tails: config.tail_consumers
-  });
+  const bindings = getBindings2(config, env6, true, {}, true);
+  const { bindingOptions, externalWorkers } = buildMiniflareBindingOptions(
+    {
+      name: config.name,
+      complianceRegion: config.compliance_region,
+      bindings,
+      workerDefinitions: null,
+      queueConsumers: config.queues.consumers,
+      services: [],
+      serviceBindings: {},
+      migrations: config.migrations,
+      imagesLocalMode: !!options?.imagesLocalMode,
+      tails: config.tail_consumers
+    },
+    options?.mixedModeConnectionString
+  );
   if (bindings.services !== void 0) {
     bindingOptions.serviceBindings = Object.fromEntries(
       bindings.services.map((binding) => {
         const name2 = binding.service === config.name ? import_miniflare29.kCurrentWorker : binding.service;
+        if (options?.mixedModeConnectionString && binding.remote) {
+          return [
+            binding.binding,
+            {
+              name: name2,
+              entrypoint: binding.entrypoint,
+              mixedModeConnectionString: options.mixedModeConnectionString
+            }
+          ];
+        }
         return [binding.binding, { name: name2, entrypoint: binding.entrypoint }];
       })
     );
@@ -177256,10 +177346,12 @@ var init_api3 = __esm({
 var cli_exports2 = {};
 __export(cli_exports2, {
   experimental_patchConfig: () => experimental_patchConfig,
+  experimental_pickRemoteBindings: () => pickRemoteBindings,
   experimental_readRawConfig: () => experimental_readRawConfig,
   experimental_startMixedModeSession: () => startMixedModeSession,
   getPlatformProxy: () => getPlatformProxy,
   unstable_DevEnv: () => DevEnv,
+  unstable_convertConfigBindingsToStartWorkerBindings: () => convertConfigBindingsToStartWorkerBindings,
   unstable_dev: () => unstable_dev,
   unstable_generateASSETSBinding: () => generateASSETSBinding2,
   unstable_getMiniflareWorkerOptions: () => unstable_getMiniflareWorkerOptions,
@@ -177362,10 +177454,12 @@ var generateASSETSBinding2 = (
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   experimental_patchConfig,
+  experimental_pickRemoteBindings,
   experimental_readRawConfig,
   experimental_startMixedModeSession,
   getPlatformProxy,
   unstable_DevEnv,
+  unstable_convertConfigBindingsToStartWorkerBindings,
   unstable_dev,
   unstable_generateASSETSBinding,
   unstable_getMiniflareWorkerOptions,