alchemy 2.0.0-beta.61 → 2.0.0-beta.62

package/src/Cloudflare/Containers/LocalContainerProvider.ts

@@ -1,10 +1,10 @@
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
-import { AlchemyContext } from "../../AlchemyContext.ts";
+import * as Redacted from "effect/Redacted";
 import * as Artifacts from "../../Artifacts.ts";
-import { getStableContextDir } from "../../Bundle/TempRoot.ts";
+import { hashDirectory } from "../../Command/Memo.ts";
 import { isResolved } from "../../Diff.ts";
-import { Docker } from "../../Docker/Docker.ts";
 import * as RpcProvider from "../../Local/RpcProvider.ts";
 import { sha256Object } from "../../Util/sha256.ts";
 import { normalizeNulls } from "../../Util/stable.ts";
@@ -13,12 +13,12 @@ import { generateLocalId, LOCAL_ENTRY_URL } from "../LocalRuntime.ts";
 import type {
   ContainerApplication,
   ContainerApplicationProps,
+  DevContainerImage,
 } from "./ContainerApplication.ts";
 import {
-  buildFinalDockerfile,
-  bundleContainerProgram,
   createContainerApplicationName,
-  foldEnvIntoEnvironmentVariables,
+  makeContainerEnv,
+  prepareContainerBuildContext,
 } from "./ContainerBundle.ts";
 import { ContainerPlatform } from "./ContainerPlatform.ts";
 
@@ -26,9 +26,10 @@ import { ContainerPlatform } from "./ContainerPlatform.ts";
  * Local (dev) provider for Cloudflare Container applications.
  *
  * The Docker build/run is owned by `@distilled.cloud/cloudflare-runtime`; this
- * provider's only job is to bundle the container program once and materialize
- * it into a stable Docker build context, then surface that context as a
- * `dev: ContainerImage.Build` output so the runtime can `docker build` it.
+ * provider's only job is to resolve the `dev` image the runtime should use —
+ * a build context to `docker build` (Effect-native `main` or a user-supplied
+ * Dockerfile) or a remote image to `docker pull` — mirroring the three image
+ * variants of the live provider's `computeImage`.
  *
  * Everything else on the attributes is a placeholder: the real
  * `applicationId`/`configuration`/etc. only exist once the live provider
@@ -41,68 +42,72 @@ export const LocalContainerProvider = () =>
     ContainerPlatform,
     LOCAL_ENTRY_URL,
     Effect.gen(function* () {
-      const { dotAlchemy } = yield* AlchemyContext;
-      const docker = yield* Docker;
+      const fs = yield* FileSystem.FileSystem;
       const path = yield* Path.Path;
 
-      // Bundle the container entrypoint and write it (plus the generated
-      // Dockerfile) into a stable build context directory. `Docker.build` in
-      // cloudflare-runtime reads `dockerfile` as a file path and uses
-      // `context` as the build context, so we point `dev` at both.
-      const prepareImage = Effect.fn(function* (
-        id: string,
-        news: ContainerApplicationProps,
-      ) {
-        const main = news.main;
-        if (!main) {
-          return yield* Effect.die(
-            new Error("Container requires a `main` entrypoint."),
-          );
-        }
-        const runtime = news.runtime ?? "bun";
-        const context = yield* getStableContextDir(
-          process.cwd(),
-          dotAlchemy,
-          `${id}-container`,
-        );
-        const dockerfileContent = buildFinalDockerfile(
-          news.dockerfile,
-          runtime,
-          news.external,
-          news.autoInstallExternals,
-        );
-        const [bundle] = yield* Effect.all(
-          [
-            bundleContainerProgram({
-              id,
-              main,
-              runtime,
-              handler: news.handler,
-              isExternal: news.isExternal,
-              external: news.external,
-              outdir: context,
-            }),
-            docker.materialize({
-              context: context,
+      // Resolve the `dev` image plus a content hash for change detection.
+      // Cached per run (`Artifacts.cached`, keyed by resource id) so repeated
+      // diffs/reconciles in a single dev session don't re-bundle or re-hash.
+      //
+      // IMPORTANT: the cached result must stay env-free. The cache is warmed
+      // by `precreate`, which runs against unresolved props — binding-derived
+      // env values (e.g. an ApiToken's value/accountId) are still unresolved
+      // `Output`s there and get skipped. Caching env here would freeze that
+      // incomplete env and start the container without its bindings;
+      // `makeAttributes` attaches the freshly-computed env instead.
+      const prepareImage = (id: string, news: ContainerApplicationProps) =>
+        Effect.gen(function* () {
+          // Variant 1 — Effect-native program. Bundle `main` and write it
+          // (plus the generated Dockerfile) into a stable build context
+          // directory. `Docker.build` in cloudflare-runtime reads `dockerfile`
+          // as a file path and uses `context` as the build context, so we
+          // point `dev` at both. The build-context materialization is shared
+          // with the live provider (see `prepareContainerBuildContext`).
+          if (news.main) {
+            const { context, dockerfile, hash } =
+              yield* prepareContainerBuildContext(id, news);
+            return {
+              dev: {
+                context: path.relative(process.cwd(), context),
+                dockerfile: path.relative(context, dockerfile),
+              } as DevContainerImage,
+              hash,
+            };
+          }
+
+          // Variant 2 — pre-built remote image. The runtime pulls it
+          // directly; there is nothing to build.
+          if (news.image) {
+            return {
+              dev: { imageUri: news.image } as DevContainerImage,
+              hash: yield* sha256Object({ image: news.image }),
+            };
+          }
+
+          // Variant 3 — user-supplied Dockerfile + build context directory.
+          // The runtime builds the user's Dockerfile against the (real-path'd)
+          // context, exactly like the live provider's `external` variant.
+          const context = yield* fs.realPath(news.context ?? ".");
+          const dockerfile = news.dockerfile
+            ? yield* fs.realPath(news.dockerfile)
+            : path.join(context, "Dockerfile");
+          const contextHash = yield* hashDirectory({ cwd: context });
+          const dockerfileContent = yield* fs.readFileString(dockerfile);
+          return {
+            dev: {
+              context: path.relative(process.cwd(), context),
+              dockerfile: path.relative(context, dockerfile),
+            } as DevContainerImage,
+            hash: yield* sha256Object({
+              contextHash,
               dockerfile: dockerfileContent,
-              files: [],
             }),
-          ],
-          { concurrency: "unbounded" },
-        );
-        return {
-          context,
-          dockerfile: path.join(context, "Dockerfile"),
-          hash: yield* sha256Object({
-            bundle: bundle.hash,
-            dockerfileContent,
-          }),
-        };
-      }, Artifacts.cached("container-image"));
+          };
+        }).pipe(Artifacts.cached(`container-image:${id}`));
 
       const placeholderConfiguration = (
         props: ContainerApplicationProps,
-        accountId: string,
+        env: Record<string, string | Redacted.Redacted<string>>,
       ) =>
         normalizeNulls({
           image: "local",
@@ -113,10 +118,10 @@ export const LocalContainerProvider = () =>
           vcpu: props.vcpu,
           memory: props.memory,
           disk: props.disk,
-          environmentVariables: foldEnvIntoEnvironmentVariables(
-            props,
-            accountId,
-          ),
+          environmentVariables: Object.entries(env).map(([name, value]) => ({
+            name,
+            value: Redacted.isRedacted(value) ? Redacted.value(value) : value,
+          })),
           labels: props.labels,
           network: props.network,
           command: props.command,
@@ -136,7 +141,8 @@ export const LocalContainerProvider = () =>
         output: ContainerApplication["Attributes"] | undefined;
       }) {
         const { accountId } = yield* yield* CloudflareEnvironment;
-        const { context, hash, dockerfile } = yield* prepareImage(id, news);
+        const env = makeContainerEnv(news, accountId);
+        const { dev, hash } = yield* prepareImage(id, news);
         return {
           applicationId: output?.applicationId ?? generateLocalId(),
           applicationName: yield* createContainerApplicationName(id, news.name),
@@ -146,11 +152,11 @@ export const LocalContainerProvider = () =>
           maxInstances: news.maxInstances ?? 1,
           constraints: news.constraints,
           affinities: news.affinities,
-          configuration: placeholderConfiguration(news, accountId),
+          configuration: placeholderConfiguration(news, env),
           durableObjects: undefined,
           createdAt: new Date().toISOString(),
           version: 1,
-          dev: { context, dockerfile },
+          dev: { ...dev, env },
           hash: { image: hash },
         } satisfies ContainerApplication["Attributes"];
       });
@@ -164,7 +170,7 @@ export const LocalContainerProvider = () =>
           if (!output) return { action: "update" };
           if (!isResolved(news)) return undefined;
           const input = yield* prepareImage(id, news);
-          return input.hash !== output.hash?.image
+          return input.hash !== output.hash?.image || !output.dev
             ? { action: "update" }
             : undefined;
         }),

package/src/Cloudflare/Diagnostics/EndpointHealthcheck.ts

@@ -260,9 +260,10 @@ const observeExisting = (accountId: string, id: string) =>
     Effect.map((hc): ObservedHealthcheck => ({ ...hc, accountId })),
     Effect.retry({
       while: (e) => e._tag === "EndpointHealthcheckNotFound",
-      schedule: Schedule.exponential("500 millis").pipe(
-        Schedule.both(Schedule.recurs(6)),
-      ),
+      schedule: Schedule.max([
+        Schedule.exponential("500 millis"),
+        Schedule.recurs(6),
+      ]),
     }),
     Effect.catchTag("EndpointHealthcheckNotFound", () =>
       Effect.succeed(undefined),

package/src/Cloudflare/Images/Variant.ts

@@ -322,9 +322,10 @@ export const VariantProvider = () =>
       // Bounded — if it never clears we stop polling and proceed.
       yield* getVariant(output.accountId, output.variantName).pipe(
         Effect.repeat({
-          schedule: Schedule.exponential("500 millis").pipe(
-            Schedule.both(Schedule.recurs(12)),
-          ),
+          schedule: Schedule.max([
+            Schedule.exponential("500 millis"),
+            Schedule.recurs(12),
+          ]),
           until: (observed) => observed === undefined,
         }),
       );

package/src/Cloudflare/LoadBalancer/Monitor.ts

@@ -286,9 +286,10 @@ export const MonitorProvider = () =>
         .pipe(
           Effect.retry({
             while: (e) => e._tag === "MonitorInUse",
-            schedule: Schedule.exponential("1 second").pipe(
-              Schedule.both(Schedule.recurs(6)),
-            ),
+            schedule: Schedule.max([
+              Schedule.exponential("1 second"),
+              Schedule.recurs(6),
+            ]),
           }),
           Effect.catchTag("MonitorNotFound", () => Effect.void),
         );

package/src/Cloudflare/LoadBalancer/MonitorGroup.ts

@@ -220,9 +220,10 @@ export const MonitorGroupProvider = () =>
         .pipe(
           Effect.retry({
             while: (e) => e._tag === "MonitorGroupInUse",
-            schedule: Schedule.exponential("1 second").pipe(
-              Schedule.both(Schedule.recurs(6)),
-            ),
+            schedule: Schedule.max([
+              Schedule.exponential("1 second"),
+              Schedule.recurs(6),
+            ]),
           }),
           Effect.catchTag("MonitorGroupNotFound", () => Effect.void),
         );

package/src/Cloudflare/LoadBalancer/Pool.ts

@@ -336,9 +336,10 @@ export const PoolProvider = () =>
         .pipe(
           Effect.retry({
             while: (e) => e._tag === "PoolInUse",
-            schedule: Schedule.exponential("1 second").pipe(
-              Schedule.both(Schedule.recurs(6)),
-            ),
+            schedule: Schedule.max([
+              Schedule.exponential("1 second"),
+              Schedule.recurs(6),
+            ]),
           }),
           Effect.catchTag("PoolNotFound", () => Effect.void),
         );

package/src/Cloudflare/LocalRuntime.ts

@@ -32,6 +32,22 @@ export class LocalRuntimeState extends Context.Service<
       Consumer["Attributes"]["consumerId"],
       Consumer["Attributes"]
     >;
+    /**
+     * Restart hooks for locally running Workers, keyed by script name.
+     *
+     * A local workerd instance bakes its queue-consumer wiring in at start
+     * time (`runtime.start({ queueConsumers })`), but the `Consumer`
+     * resource that populates {@link queueConsumers} reconciles as a
+     * *sibling* of the Worker — the engine may start workerd before the
+     * consumer registers. Providers that mutate a worker's runtime wiring
+     * (e.g. `ConsumerProviderLocal`) invoke the script's hook after
+     * updating state so the running instance is reconfigured; the hook is
+     * a no-op until the worker has served at least once.
+     */
+    readonly workerRestarts: MutableHashMap.MutableHashMap<
+      string,
+      Effect.Effect<void>
+    >;
   }
 >()("alchemy/cloudflare/LocalRuntimeState") {}
 
@@ -40,6 +56,7 @@ const LocalRuntimeStateLive = Layer.succeed(
   LocalRuntimeState.of({
     queues: MutableHashMap.empty(),
     queueConsumers: MutableHashMap.empty(),
+    workerRestarts: MutableHashMap.empty(),
   }),
 );
 

package/src/Cloudflare/MagicNetworkMonitoring/Rule.ts

@@ -286,9 +286,10 @@ export const RuleProvider = () =>
             // config has propagated, so ride out that consistency window.
             Effect.retry({
               while: (e) => e._tag === "MnmConfigMissing",
-              schedule: Schedule.exponential("500 millis").pipe(
-                Schedule.both(Schedule.recurs(8)),
-              ),
+              schedule: Schedule.max([
+                Schedule.exponential("500 millis"),
+                Schedule.recurs(8),
+              ]),
             }),
             Effect.catchTag("DuplicateMnmRuleName", (error) =>
               findByName(accountId, name).pipe(

package/src/Cloudflare/Pipelines/Pipeline.ts

@@ -175,9 +175,10 @@ export const PipelineProvider = () =>
         // race an `PipelineAlreadyExists` against the dying pipeline.
         yield* getPipeline(accountId, observed.id).pipe(
           Effect.repeat({
-            schedule: Schedule.exponential("250 millis").pipe(
-              Schedule.both(Schedule.recurs(8)),
-            ),
+            schedule: Schedule.max([
+              Schedule.exponential("250 millis"),
+              Schedule.recurs(8),
+            ]),
             until: (p) => p === undefined,
           }),
         );
@@ -196,9 +197,10 @@ export const PipelineProvider = () =>
           .pipe(
             Effect.retry({
               while: (e) => e._tag === "TableNotFound",
-              schedule: Schedule.exponential("500 millis").pipe(
-                Schedule.both(Schedule.recurs(6)),
-              ),
+              schedule: Schedule.max([
+                Schedule.exponential("500 millis"),
+                Schedule.recurs(6),
+              ]),
             }),
             Effect.catchTag("PipelineAlreadyExists", (error) =>
               findPipelineByName(accountId, name).pipe(

package/src/Cloudflare/Pipelines/Sink.ts

@@ -348,9 +348,10 @@ export const SinkProvider = () =>
         // race a `SinkAlreadyExists` against the dying sink.
         yield* getSink(accountId, observed.id).pipe(
           Effect.repeat({
-            schedule: Schedule.exponential("250 millis").pipe(
-              Schedule.both(Schedule.recurs(8)),
-            ),
+            schedule: Schedule.max([
+              Schedule.exponential("250 millis"),
+              Schedule.recurs(8),
+            ]),
             until: (s) => s === undefined,
           }),
         );
@@ -458,9 +459,10 @@ const deleteSink = (accountId: string, sinkId: string) =>
   pipelines.deleteSink({ accountId, sinkId }).pipe(
     Effect.retry({
       while: (e) => e._tag === "SinkInUse",
-      schedule: Schedule.exponential("500 millis").pipe(
-        Schedule.both(Schedule.recurs(8)),
-      ),
+      schedule: Schedule.max([
+        Schedule.exponential("500 millis"),
+        Schedule.recurs(8),
+      ]),
     }),
     Effect.catchTag("SinkNotFound", () => Effect.void),
     Effect.catchTag("InvalidSinkId", () => Effect.void),

package/src/Cloudflare/Pipelines/Stream.ts

@@ -367,9 +367,10 @@ export const StreamProvider = () =>
         .pipe(
           Effect.retry({
             while: (e) => e._tag === "StreamInUse",
-            schedule: Schedule.exponential("500 millis").pipe(
-              Schedule.both(Schedule.recurs(8)),
-            ),
+            schedule: Schedule.max([
+              Schedule.exponential("500 millis"),
+              Schedule.recurs(8),
+            ]),
           }),
           Effect.catchTag("StreamNotFound", () => Effect.void),
           Effect.catchTag("InvalidStreamId", () => Effect.void),

package/src/Cloudflare/Providers.ts

@@ -476,7 +476,7 @@ export const providers = () =>
         Devices.DeviceSettingsProvider(),
 
         // Split into nested groups: a single flat mergeAll with ~200
-        // arguments exceeds tsgo's variadic inference ceiling and
+        // arguments exceeds tsc's variadic inference ceiling and
         // silently drops the tail layers from the inferred union.
         Layer.mergeAll(
           Diagnostics.EndpointHealthcheckProvider(),
@@ -731,25 +731,27 @@ const cloudflareRetryFactory: Retry.Factory = (lastError) => {
   return {
     while: (error) =>
       defaults.while?.(error) === true || isMisleadinglyTaggedTransient(error),
-    schedule: pipe(
-      Schedule.exponential(Duration.millis(250), 2),
-      Schedule.modifyDelay(
-        Effect.fn(function* (duration) {
-          const error = yield* Ref.get(lastError);
-          // Throttling errors (429): honor a 500ms floor matching the
-          // distilled default.
-          const isThrottling =
-            (error as { _tag?: unknown })?._tag === "TooManyRequests";
-          if (isThrottling && Duration.toMillis(duration) < 500) {
-            return Duration.toMillis(Duration.millis(500));
-          }
-          return Duration.toMillis(duration);
-        }),
+    schedule: Schedule.max([
+      pipe(
+        Schedule.exponential(Duration.millis(250), 2),
+        Schedule.modifyDelay(
+          Effect.fn(function* ({ duration }) {
+            const error = yield* Ref.get(lastError);
+            // Throttling errors (429): honor a 500ms floor matching the
+            // distilled default.
+            const isThrottling =
+              (error as { _tag?: unknown })?._tag === "TooManyRequests";
+            if (isThrottling && Duration.toMillis(duration) < 500) {
+              return Duration.toMillis(Duration.millis(500));
+            }
+            return Duration.toMillis(duration);
+          }),
+        ),
+        Retry.capped(Duration.seconds(5)),
+        Retry.jittered,
       ),
-      Retry.capped(Duration.seconds(5)),
-      Retry.jittered,
-      Schedule.both(Schedule.recurs(8)),
-    ),
+      Schedule.recurs(8),
+    ]),
   };
 };
 

package/src/Cloudflare/Queues/Consumer.ts

@@ -308,9 +308,10 @@ export const ConsumerProviderLive = () =>
             Effect.catchTag("ConsumerNotFound", () => Effect.void),
             Effect.retry({
               while: (e) => e === "still-attached",
-              schedule: Schedule.spaced("1 second").pipe(
-                Schedule.both(Schedule.recurs(30)),
-              ),
+              schedule: Schedule.max([
+                Schedule.spaced("1 second"),
+                Schedule.recurs(30),
+              ]),
             }),
             Effect.ignore,
           );
@@ -487,9 +488,10 @@ export const ConsumerProviderLive = () =>
           Effect.catchTag("ConsumerNotFound", () => Effect.void),
           Effect.retry({
             while: (e) => e === "still-attached",
-            schedule: Schedule.spaced("1 second").pipe(
-              Schedule.both(Schedule.recurs(30)),
-            ),
+            schedule: Schedule.max([
+              Schedule.spaced("1 second"),
+              Schedule.recurs(30),
+            ]),
           }),
           Effect.ignore,
         );
@@ -561,9 +563,10 @@ const toObserved = (c: {
 
 // ~60s budget — Worker reconcile uploads typically land in 2–10s,
 // but a fresh container/asset deploy can stretch that.
-const queueHandlerReadinessSchedule = Schedule.spaced("2 seconds").pipe(
-  Schedule.both(Schedule.recurs(30)),
-);
+const queueHandlerReadinessSchedule = Schedule.max([
+  Schedule.spaced("2 seconds"),
+  Schedule.recurs(30),
+]);
 
 export const ConsumerProviderLocal = () =>
   RpcProvider.effect(
@@ -571,6 +574,27 @@ export const ConsumerProviderLocal = () =>
     LOCAL_ENTRY_URL,
     Effect.gen(function* () {
       const localRuntimeState = yield* LocalRuntimeState;
+
+      // Restart the locally running workerd instances (if any) for the
+      // given scripts so start-time queue-consumer wiring is re-read from
+      // `localRuntimeState.queueConsumers`. See `workerRestarts` on
+      // {@link LocalRuntimeState}.
+      const restartScripts = (scriptNames: ReadonlyArray<string>) =>
+        Effect.forEach(
+          scriptNames,
+          (scriptName) =>
+            MutableHashMap.get(
+              localRuntimeState.workerRestarts,
+              scriptName,
+            ).pipe(
+              Option.match({
+                onNone: () => Effect.void,
+                onSome: (restart) => restart,
+              }),
+            ),
+          { discard: true },
+        );
+
       return {
         list: () =>
           Effect.sync(() =>
@@ -625,6 +649,17 @@ export const ConsumerProviderLocal = () =>
             consumer.consumerId,
             consumer,
           );
+          // A local workerd instance only reads its queue-consumer wiring
+          // at start time, and this reconcile races the sibling Worker's
+          // start (the Worker's `precreate` resolves `scriptName` before
+          // workerd is up). Restart any already-running instance so it
+          // picks up the new wiring; if the worker hasn't served yet this
+          // is a no-op and its first serve observes the map we just set.
+          yield* restartScripts(
+            output && output.scriptName !== consumer.scriptName
+              ? [output.scriptName, consumer.scriptName]
+              : [consumer.scriptName],
+          );
           return consumer;
         }),
         delete: Effect.fn(function* ({ output }) {
@@ -632,6 +667,7 @@ export const ConsumerProviderLocal = () =>
             localRuntimeState.queueConsumers,
             output.consumerId,
           );
+          yield* restartScripts([output.scriptName]);
         }),
       };
     }),

package/src/Cloudflare/Queues/Queue.ts

@@ -208,9 +208,10 @@ export const ProviderLive = () =>
         .pipe(
           Effect.retry({
             while: (e) => e._tag === "QueueInUseByEventNotification",
-            schedule: Schedule.exponential("1 second").pipe(
-              Schedule.both(Schedule.recurs(8)),
-            ),
+            schedule: Schedule.max([
+              Schedule.exponential("1 second"),
+              Schedule.recurs(8),
+            ]),
           }),
           Effect.catchTag("QueueNotFound", () => Effect.void),
         );

package/src/Cloudflare/R2/Bucket.ts

@@ -1136,16 +1136,18 @@ export const BucketProvider = () =>
 // sub-resource endpoints (custom domains, lifecycle) accept it. Retry only
 // that narrow `NoSuchBucket` lag here; not-found sub-resources are still
 // treated as terminal for idempotent deletes.
-const r2BucketEndpointConsistencySchedule = Schedule.exponential(100).pipe(
-  Schedule.both(Schedule.recurs(5)),
-);
+const r2BucketEndpointConsistencySchedule = Schedule.max([
+  Schedule.exponential(100),
+  Schedule.recurs(5),
+]);
 
 // R2 sub-resource reads (notably the custom-domain endpoint, which touches the
 // bucket's public-access policy) can return a transient 500 ("Failed to access
 // or modify the bucket policy"). Ride out the blip with a short bounded retry.
-const r2TransientServerErrorSchedule = Schedule.exponential("500 millis").pipe(
-  Schedule.both(Schedule.recurs(6)),
-);
+const r2TransientServerErrorSchedule = Schedule.max([
+  Schedule.exponential("500 millis"),
+  Schedule.recurs(6),
+]);
 
 // Distilled widened generated string enums to open unions (`string & {}`); the
 // API only ever returns the known variants, narrowed in `toCustomDomainAttributes`.
@@ -1266,6 +1268,7 @@ const toLifecyclePutPayload = (
 // consistency and retry it on create. Releasing a custom domain after delete
 // can lag a few seconds, so give the conflict a longer, bounded budget than
 // the bucket-endpoint lag above.
-const r2CustomDomainConflictSchedule = Schedule.spaced("2 seconds").pipe(
-  Schedule.both(Schedule.recurs(8)),
-);
+const r2CustomDomainConflictSchedule = Schedule.max([
+  Schedule.spaced("2 seconds"),
+  Schedule.recurs(8),
+]);

package/src/Cloudflare/R2/BucketEventNotification.ts

@@ -456,9 +456,10 @@ export const BucketEventNotificationProvider = () =>
 // R2 can make a freshly-created bucket/queue visible to its own endpoints
 // before the event-notification endpoints accept it. Retry only that narrow
 // not-found lag with a bounded budget.
-const r2EventNotificationConsistencySchedule = Schedule.exponential(250).pipe(
-  Schedule.both(Schedule.recurs(6)),
-);
+const r2EventNotificationConsistencySchedule = Schedule.max([
+  Schedule.exponential(250),
+  Schedule.recurs(6),
+]);
 
 type ObservedBucket = NonNullable<r2.ListBucketsResponse["buckets"]>[number];
 

package/src/Cloudflare/R2/DataCatalog.ts

@@ -373,9 +373,10 @@ export const DataCatalogProvider = () =>
 
 // A freshly-created bucket (or freshly-enabled catalog) can briefly 404 on
 // the r2-catalog endpoints before the warehouse propagates.
-const catalogConsistencySchedule = Schedule.exponential(100).pipe(
-  Schedule.both(Schedule.recurs(5)),
-);
+const catalogConsistencySchedule = Schedule.max([
+  Schedule.exponential(100),
+  Schedule.recurs(5),
+]);
 
 /**
  * Read a catalog by bucket name, mapping "gone" (`WarehouseNotFound`, code