alchemy 2.0.0-beta.61 → 2.0.0-beta.63

package/src/AWS/DynamoDB/Table.ts

@@ -342,21 +342,25 @@ export const TableProvider = () =>
         error._tag === "ProvisionedThroughputExceededException" ||
         error._tag === "RequestLimitExceeded";
 
-      const waitForControlPlaneConvergence = Schedule.fixed("1 second").pipe(
-        Schedule.both(Schedule.recurs(120)),
-      );
-
-      const waitForTableActivationConvergence = Schedule.fixed(
-        "10 seconds",
-      ).pipe(Schedule.both(Schedule.recurs(180)));
-
-      const waitForGlobalSecondaryIndexesConvergence = Schedule.fixed(
-        "10 seconds",
-      ).pipe(Schedule.both(Schedule.recurs(180)));
-
-      const waitForDeletionConvergence = Schedule.fixed("1 second").pipe(
-        Schedule.both(Schedule.recurs(90)),
-      );
+      const waitForControlPlaneConvergence = Schedule.max([
+        Schedule.fixed("1 second"),
+        Schedule.recurs(120),
+      ]);
+
+      const waitForTableActivationConvergence = Schedule.max([
+        Schedule.fixed("10 seconds"),
+        Schedule.recurs(180),
+      ]);
+
+      const waitForGlobalSecondaryIndexesConvergence = Schedule.max([
+        Schedule.fixed("10 seconds"),
+        Schedule.recurs(180),
+      ]);
+
+      const waitForDeletionConvergence = Schedule.max([
+        Schedule.fixed("1 second"),
+        Schedule.recurs(90),
+      ]);
 
       const formatPollingElapsed = (elapsedSeconds: number) =>
         `${elapsedSeconds}s elapsed`;
@@ -386,9 +390,10 @@ export const TableProvider = () =>
           .pipe(
             Effect.retry({
               while: isRetryableControlPlaneError,
-              schedule: Schedule.exponential(100).pipe(
-                Schedule.both(Schedule.recurs(30)),
-              ),
+              schedule: Schedule.max([
+                Schedule.exponential(100),
+                Schedule.recurs(30),
+              ]),
             }),
           );
 
@@ -406,9 +411,10 @@ export const TableProvider = () =>
               while: (e) =>
                 e._tag === "ContinuousBackupsUnavailableException" ||
                 isRetryableControlPlaneError(e),
-              schedule: Schedule.exponential(250).pipe(
-                Schedule.both(Schedule.recurs(30)),
-              ),
+              schedule: Schedule.max([
+                Schedule.exponential(250),
+                Schedule.recurs(30),
+              ]),
             }),
           );
 
@@ -439,8 +445,8 @@ export const TableProvider = () =>
               error._tag === "TableNotActive" ||
               isRetryableControlPlaneError(error),
             schedule: waitForTableActivationConvergence.pipe(
-              Schedule.tapOutput(([, attempt]) => {
-                elapsedSeconds = (attempt + 1) * 10;
+              Schedule.tap(({ attempt }) => {
+                elapsedSeconds = attempt * 10;
                 return session.note(
                   `${progressMessage} (${formatPollingElapsed(elapsedSeconds)})`,
                 );
@@ -491,8 +497,8 @@ export const TableProvider = () =>
               error._tag === "TableIndexesNotStable" ||
               isRetryableControlPlaneError(error),
             schedule: waitForGlobalSecondaryIndexesConvergence.pipe(
-              Schedule.tapOutput(([, attempt]) => {
-                elapsedSeconds = (attempt + 1) * 10;
+              Schedule.tap(({ attempt }) => {
+                elapsedSeconds = attempt * 10;
                 return session.note(
                   `${progressMessage} (${formatPollingElapsed(elapsedSeconds)})`,
                 );
@@ -528,8 +534,8 @@ export const TableProvider = () =>
               error._tag === "TableStillDeleting" ||
               isRetryableControlPlaneError(error),
             schedule: waitForDeletionConvergence.pipe(
-              Schedule.tapOutput(([, attempt]) => {
-                elapsedSeconds = attempt + 1;
+              Schedule.tap(({ attempt }) => {
+                elapsedSeconds = attempt;
                 return session.note(
                   `${progressMessage} (${formatPollingElapsed(elapsedSeconds)})`,
                 );
@@ -628,8 +634,8 @@ export const TableProvider = () =>
                     return false;
                   },
                   schedule: waitForGlobalSecondaryIndexesConvergence.pipe(
-                    Schedule.tapOutput(([, attempt]) => {
-                      elapsedSeconds = (attempt + 1) * 10;
+                    Schedule.tap(({ attempt }) => {
+                      elapsedSeconds = attempt * 10;
                       return session.note(
                         `${progressMessage} (${formatPollingElapsed(elapsedSeconds)})`,
                       );
@@ -672,9 +678,10 @@ export const TableProvider = () =>
             .pipe(
               Effect.retry({
                 while: isRetryableReadError,
-                schedule: Schedule.exponential(250).pipe(
-                  Schedule.both(Schedule.recurs(30)),
-                ),
+                schedule: Schedule.max([
+                  Schedule.exponential(250),
+                  Schedule.recurs(30),
+                ]),
               }),
             );
           const table = response.Table;
@@ -693,9 +700,10 @@ export const TableProvider = () =>
                 .pipe(
                   Effect.retry({
                     while: isRetryableReadError,
-                    schedule: Schedule.exponential(250).pipe(
-                      Schedule.both(Schedule.recurs(30)),
-                    ),
+                    schedule: Schedule.max([
+                      Schedule.exponential(250),
+                      Schedule.recurs(30),
+                    ]),
                   }),
                 ),
               dynamodb
@@ -705,9 +713,10 @@ export const TableProvider = () =>
                 .pipe(
                   Effect.retry({
                     while: (e) => e._tag === "InternalServerError",
-                    schedule: Schedule.exponential(250).pipe(
-                      Schedule.both(Schedule.recurs(30)),
-                    ),
+                    schedule: Schedule.max([
+                      Schedule.exponential(250),
+                      Schedule.recurs(30),
+                    ]),
                   }),
                   Effect.catchTag("TableNotFoundException", () =>
                     Effect.succeed({ ContinuousBackupsDescription: undefined }),
@@ -720,9 +729,10 @@ export const TableProvider = () =>
                 .pipe(
                   Effect.retry({
                     while: isRetryableReadError,
-                    schedule: Schedule.exponential(250).pipe(
-                      Schedule.both(Schedule.recurs(30)),
-                    ),
+                    schedule: Schedule.max([
+                      Schedule.exponential(250),
+                      Schedule.recurs(30),
+                    ]),
                   }),
                   Effect.catchTag("ResourceNotFoundException", () =>
                     Effect.succeed({ TimeToLiveDescription: undefined }),
@@ -969,10 +979,10 @@ export const TableProvider = () =>
                     while: (e) =>
                       e._tag === "ThrottlingException" ||
                       e._tag === "ValidationException",
-                    schedule: Schedule.exponential(250).pipe(
-                      Schedule.jittered,
-                      Schedule.both(Schedule.recurs(12)),
-                    ),
+                    schedule: Schedule.max([
+                      Schedule.exponential(250).pipe(Schedule.jittered),
+                      Schedule.recurs(12),
+                    ]),
                   }),
                   // Last resort: if a foreign table never settles within the
                   // retry budget (e.g. a peer is still mid-create/delete when
@@ -1374,9 +1384,9 @@ export const TableProvider = () =>
                     error._tag === "InternalServerError" ||
                     error._tag === "TimeoutError",
                   schedule: waitForDeletionConvergence.pipe(
-                    Schedule.tapOutput(([, attempt]) =>
+                    Schedule.tap(({ attempt }) =>
                       session.note(
-                        `DynamoDB Table provider: deleteTable transient failure for ${output.tableName} on attempt ${deleteAttempt} (${formatPollingElapsed(attempt + 1)})`,
+                        `DynamoDB Table provider: deleteTable transient failure for ${output.tableName} on attempt ${deleteAttempt} (${formatPollingElapsed(attempt)})`,
                       ),
                     ),
                   ),

package/src/AWS/EC2/EIP.ts

@@ -365,11 +365,13 @@ export const EIPProvider = () =>
                     e._tag === "InvalidIPAddress.InUse"
                   );
                 },
-                schedule: Schedule.exponential(1000, 1.5).pipe(
-                  Schedule.both(Schedule.recurs(20)),
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.exponential(1000, 1.5),
+                  Schedule.recurs(20),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `EIP still in use, waiting for release... (attempt ${attempt + 1})`,
+                      `EIP still in use, waiting for release... (attempt ${attempt})`,
                     ),
                   ),
                 ),

package/src/AWS/EC2/EgressOnlyInternetGateway.ts

@@ -347,11 +347,13 @@ export const EgressOnlyInternetGatewayProvider = () =>
               Effect.retry({
                 while: (e: { _tag: string }) =>
                   e._tag === "DependencyViolation",
-                schedule: Schedule.fixed(5000).pipe(
-                  Schedule.both(Schedule.recurs(30)), // Up to ~2.5 minutes
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.fixed(5000),
+                  Schedule.recurs(30),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),

package/src/AWS/EC2/Instance.ts

@@ -501,9 +501,10 @@ export const InstanceProvider = () =>
             while: (error) =>
               error instanceof InstanceStateMismatch ||
               isPendingInstanceLookupError(error),
-            schedule: Schedule.exponential("250 millis").pipe(
-              Schedule.both(Schedule.recurs(8)),
-            ),
+            schedule: Schedule.max([
+              Schedule.exponential("250 millis"),
+              Schedule.recurs(8),
+            ]),
           }),
         );
       });
@@ -530,9 +531,10 @@ export const InstanceProvider = () =>
             while: (error) => error instanceof InstanceStillExists,
             // Termination (shutting-down -> terminated) can take a couple of
             // minutes; the prior ~64s budget timed out intermittently.
-            schedule: Schedule.spaced("5 seconds").pipe(
-              Schedule.both(Schedule.recurs(48)),
-            ),
+            schedule: Schedule.max([
+              Schedule.spaced("5 seconds"),
+              Schedule.recurs(48),
+            ]),
           }),
           Effect.catchTag("InvalidInstanceID.NotFound", () => Effect.void),
           Effect.catchTag("InstanceNotFound", () => Effect.void),
@@ -711,9 +713,10 @@ export const InstanceProvider = () =>
               .pipe(
                 Effect.retry({
                   while: isPendingInstanceProfileError,
-                  schedule: Schedule.exponential("500 millis").pipe(
-                    Schedule.both(Schedule.recurs(8)),
-                  ),
+                  schedule: Schedule.max([
+                    Schedule.exponential("500 millis"),
+                    Schedule.recurs(8),
+                  ]),
                 }),
               );
             const newInstanceId = created.Instances?.[0]?.InstanceId as

package/src/AWS/EC2/InternetGateway.ts

@@ -332,11 +332,13 @@ export const InternetGatewayProvider = () =>
                     while: (e) => {
                       return e._tag === "DependencyViolation";
                     },
-                    schedule: Schedule.fixed(5000).pipe(
-                      Schedule.both(Schedule.recurs(60)), // Up to 5 minutes
-                      Schedule.tapOutput(([, attempt]) =>
+                    schedule: Schedule.max([
+                      Schedule.fixed(5000),
+                      Schedule.recurs(60),
+                    ]).pipe(
+                      Schedule.tap(({ attempt }) =>
                         session.note(
-                          `Waiting for VPC dependencies to clear before detaching... (attempt ${attempt + 1})`,
+                          `Waiting for VPC dependencies to clear before detaching... (attempt ${attempt})`,
                         ),
                       ),
                     ),
@@ -367,11 +369,13 @@ export const InternetGatewayProvider = () =>
                       e.message?.includes("DependencyViolation"))
                   );
                 },
-                schedule: Schedule.fixed(5000).pipe(
-                  Schedule.both(Schedule.recurs(60)), // Up to 5 minutes
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.fixed(5000),
+                  Schedule.recurs(60),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),
@@ -439,11 +443,13 @@ const waitForInternetGatewayDeleted = (
         return yield* Effect.fail(new Error("Internet gateway still exists"));
       }),
       {
-        schedule: Schedule.fixed(2000).pipe(
-          Schedule.both(Schedule.recurs(15)),
-          Schedule.tapOutput(([, attempt]) =>
+        schedule: Schedule.max([
+          Schedule.fixed(2000),
+          Schedule.recurs(15),
+        ]).pipe(
+          Schedule.tap(({ attempt }) =>
             session.note(
-              `Waiting for internet gateway deletion... (${(attempt + 1) * 2}s)`,
+              `Waiting for internet gateway deletion... (${attempt * 2}s)`,
             ),
           ),
         ),

package/src/AWS/EC2/NatGateway.ts

@@ -533,11 +533,10 @@ const waitForNatGatewayAvailable = (
     Effect.tapError(Effect.logDebug),
     Effect.retry({
       while: (e) => e._tag === "NatGatewayPending",
-      schedule: Schedule.fixed(5000).pipe(
-        Schedule.both(Schedule.recurs(60)), // Max 5 minutes
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(5000), Schedule.recurs(60)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session.note(
-            `Waiting for NAT Gateway to be available... (${(attempt + 1) * 5}s)`,
+            `Waiting for NAT Gateway to be available... (${attempt * 5}s)`,
           ),
         ),
       ),
@@ -580,12 +579,9 @@ const waitForNatGatewayDeleted = (
     Effect.tapError(Effect.logDebug),
     Effect.retry({
       while: (e) => e._tag === "NatGatewayDeleting",
-      schedule: Schedule.fixed(5000).pipe(
-        Schedule.both(Schedule.recurs(60)), // Max 5 minutes
-        Schedule.tapOutput(([, attempt]) =>
-          session.note(
-            `Waiting for NAT Gateway deletion... (${(attempt + 1) * 5}s)`,
-          ),
+      schedule: Schedule.max([Schedule.fixed(5000), Schedule.recurs(60)]).pipe(
+        Schedule.tap(({ attempt }) =>
+          session.note(`Waiting for NAT Gateway deletion... (${attempt * 5}s)`),
         ),
       ),
     }),

package/src/AWS/EC2/NetworkAcl.ts

@@ -335,11 +335,13 @@ export const NetworkAclProvider = () =>
                 while: (e) => {
                   return e._tag === "DependencyViolation";
                 },
-                schedule: Schedule.exponential(1000, 1.5).pipe(
-                  Schedule.both(Schedule.recurs(15)),
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.exponential(1000, 1.5),
+                  Schedule.recurs(15),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),

package/src/AWS/EC2/NetworkAclEntry.ts

@@ -389,9 +389,10 @@ export const NetworkAclEntryProvider = () =>
             ),
             Effect.retry({
               while: (e) => e._tag === "EntryNotYetVisible",
-              schedule: Schedule.exponential("500 millis").pipe(
-                Schedule.both(Schedule.recurs(8)),
-              ),
+              schedule: Schedule.max([
+                Schedule.exponential("500 millis"),
+                Schedule.recurs(8),
+              ]),
             }),
             Effect.catchTag("EntryNotYetVisible", () =>
               Effect.fail(

package/src/AWS/EC2/RouteTable.ts

@@ -458,11 +458,13 @@ export const RouteTableProvider = () =>
                 while: (e) => {
                   return e._tag === "DependencyViolation";
                 },
-                schedule: Schedule.exponential(1000, 1.5).pipe(
-                  Schedule.both(Schedule.recurs(10)), // Try up to 10 times
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.exponential(1000, 1.5),
+                  Schedule.recurs(10),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),
@@ -530,12 +532,13 @@ const waitForRouteTableDeleted = (
         return yield* Effect.fail(new Error("Route table still exists"));
       }),
       {
-        schedule: Schedule.fixed(2000).pipe(
-          // Check every 2 seconds
-          Schedule.both(Schedule.recurs(15)), // Max 30 seconds
-          Schedule.tapOutput(([, attempt]) =>
+        schedule: Schedule.max([
+          Schedule.fixed(2000),
+          Schedule.recurs(15),
+        ]).pipe(
+          Schedule.tap(({ attempt }) =>
             session.note(
-              `Waiting for route table deletion... (${(attempt + 1) * 2}s)`,
+              `Waiting for route table deletion... (${attempt * 2}s)`,
             ),
           ),
         ),

package/src/AWS/EC2/RouteTableAssociation.ts

@@ -412,13 +412,11 @@ const waitForAssociationState = (
       );
     }),
     {
-      schedule: Schedule.fixed(1000).pipe(
-        // Check every second
-        Schedule.both(Schedule.recurs(30)), // Max 30 seconds
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(1000), Schedule.recurs(30)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session
             ? session.note(
-                `Waiting for association to be ${targetState}... (${attempt + 1}s)`,
+                `Waiting for association to be ${targetState}... (${attempt}s)`,
               )
             : Effect.void,
         ),

package/src/AWS/EC2/SecurityGroup.ts

@@ -558,9 +558,10 @@ export const SecurityGroupProvider = () =>
                 // `InvalidVpcID.NotFound`. Retry, bounded.
                 Effect.retry({
                   while: (e) => e._tag === "InvalidVpcID.NotFound",
-                  schedule: Schedule.fixed("1 second").pipe(
-                    Schedule.both(Schedule.recurs(15)),
-                  ),
+                  schedule: Schedule.max([
+                    Schedule.fixed("1 second"),
+                    Schedule.recurs(15),
+                  ]),
                 }),
               );
             const newGroupId = result.GroupId! as SecurityGroupId;
@@ -690,11 +691,13 @@ export const SecurityGroupProvider = () =>
                       e.message?.includes("DependencyViolation"))
                   );
                 },
-                schedule: Schedule.fixed(5000).pipe(
-                  Schedule.both(Schedule.recurs(30)), // Up to ~2.5 minutes
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.fixed(5000),
+                  Schedule.recurs(30),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),

package/src/AWS/EC2/Subnet.ts

@@ -604,12 +604,16 @@ export const SubnetProvider = () =>
                   // This can happen if ENIs/instances are being deleted concurrently
                   return e._tag === "DependencyViolation";
                 },
-                schedule: Schedule.exponential(1000, 1.5).pipe(
-                  Schedule.either(Schedule.spaced("30 seconds")),
-                  Schedule.both(Schedule.recurs(30)),
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.min([
+                    Schedule.exponential(1000, 1.5),
+                    Schedule.spaced("30 seconds"),
+                  ]),
+                  Schedule.recurs(30),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),
@@ -700,12 +704,11 @@ const waitForSubnetAvailable = (
   }).pipe(
     Effect.retry({
       while: (e) => e instanceof SubnetPending,
-      schedule: Schedule.fixed(2000).pipe(
-        Schedule.both(Schedule.recurs(30)), // Max 60 seconds
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(2000), Schedule.recurs(30)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session
             ? session.note(
-                `Waiting for subnet to be available... (${(attempt + 1) * 2}s)`,
+                `Waiting for subnet to be available... (${attempt * 2}s)`,
               )
             : Effect.void,
         ),
@@ -738,12 +741,9 @@ const waitForSubnetDeleted = (
   }).pipe(
     Effect.retry({
       while: (e) => e instanceof SubnetStillExists,
-      schedule: Schedule.fixed(2000).pipe(
-        Schedule.both(Schedule.recurs(15)), // Max 30 seconds
-        Schedule.tapOutput(([, attempt]) =>
-          session.note(
-            `Waiting for subnet deletion... (${(attempt + 1) * 2}s)`,
-          ),
+      schedule: Schedule.max([Schedule.fixed(2000), Schedule.recurs(15)]).pipe(
+        Schedule.tap(({ attempt }) =>
+          session.note(`Waiting for subnet deletion... (${attempt * 2}s)`),
         ),
       ),
     }),

package/src/AWS/EC2/Vpc.ts

@@ -550,11 +550,13 @@ export const VpcProvider = () =>
                   );
                 },
                 // Use fixed 5s delay instead of exponential to avoid very long waits
-                schedule: Schedule.fixed(5000).pipe(
-                  Schedule.both(Schedule.recurs(60)), // Up to 5 minutes total
-                  Schedule.tapOutput(([, attempt]) =>
+                schedule: Schedule.max([
+                  Schedule.fixed(5000),
+                  Schedule.recurs(60),
+                ]).pipe(
+                  Schedule.tap(({ attempt }) =>
                     session.note(
-                      `Waiting for dependencies to clear... (attempt ${attempt + 1})`,
+                      `Waiting for dependencies to clear... (attempt ${attempt})`,
                     ),
                   ),
                 ),
@@ -609,12 +611,11 @@ const waitForVpcAvailable = (
   }).pipe(
     Effect.retry({
       while: (e) => e instanceof VpcPending,
-      schedule: Schedule.fixed(2000).pipe(
-        Schedule.both(Schedule.recurs(30)), // Max 60 seconds
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(2000), Schedule.recurs(30)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session
             ? session.note(
-                `Waiting for VPC to be available... (${(attempt + 1) * 2}s)`,
+                `Waiting for VPC to be available... (${attempt * 2}s)`,
               )
             : Effect.void,
         ),
@@ -644,10 +645,9 @@ const waitForVpcDeleted = (vpcId: string, session: ScopedPlanStatusSession) =>
   }).pipe(
     Effect.retry({
       while: (e) => e instanceof VpcStillExists,
-      schedule: Schedule.fixed(2000).pipe(
-        Schedule.both(Schedule.recurs(15)), // Max 30 seconds
-        Schedule.tapOutput(([, attempt]) =>
-          session.note(`Waiting for VPC deletion... (${(attempt + 1) * 2}s)`),
+      schedule: Schedule.max([Schedule.fixed(2000), Schedule.recurs(15)]).pipe(
+        Schedule.tap(({ attempt }) =>
+          session.note(`Waiting for VPC deletion... (${attempt * 2}s)`),
         ),
       ),
     }),

package/src/AWS/EC2/VpcEndpoint.ts

@@ -714,11 +714,10 @@ const waitForVpcEndpointAvailable = (
   }).pipe(
     Effect.retry({
       while: (e) => e._tag === "VpcEndpointPending",
-      schedule: Schedule.fixed(3000).pipe(
-        Schedule.both(Schedule.recurs(60)), // Max 3 minutes
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(3000), Schedule.recurs(60)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session.note(
-            `Waiting for VPC Endpoint to be available... (${(attempt + 1) * 3}s)`,
+            `Waiting for VPC Endpoint to be available... (${attempt * 3}s)`,
           ),
         ),
       ),
@@ -752,11 +751,10 @@ const waitForVpcEndpointDeleted = (
   }).pipe(
     Effect.retry({
       while: (e) => e._tag === "VpcEndpointDeleting",
-      schedule: Schedule.fixed(3000).pipe(
-        Schedule.both(Schedule.recurs(60)), // Max 3 minutes
-        Schedule.tapOutput(([, attempt]) =>
+      schedule: Schedule.max([Schedule.fixed(3000), Schedule.recurs(60)]).pipe(
+        Schedule.tap(({ attempt }) =>
           session.note(
-            `Waiting for VPC Endpoint deletion... (${(attempt + 1) * 3}s)`,
+            `Waiting for VPC Endpoint deletion... (${attempt * 3}s)`,
           ),
         ),
       ),

package/src/AWS/EC2/hosted.ts

@@ -188,6 +188,7 @@ export const createEc2HostedSupport = ({
 import { BunServices } from "@effect/platform-bun";
 import { BunHttpServer } from "alchemy/Http";
 import { Stack } from "alchemy/Stack";
+import { reifyBoundConfigProvider } from "alchemy/Runtime";
 import * as Config from "effect/Config";
 import * as ConfigProvider from "effect/ConfigProvider";
 import * as Credentials from "@distilled.cloud/aws/Credentials";
@@ -233,7 +234,7 @@ const program = handler.pipe(
       Layer.provideMerge(
         Layer.succeed(
           ConfigProvider.ConfigProvider,
-          ConfigProvider.fromEnv()
+          reifyBoundConfigProvider(ConfigProvider.fromEnv(), process.env)
         )
       ),
     )

package/src/AWS/ECS/Service.ts

@@ -819,9 +819,10 @@ export const ServiceProvider = () =>
               // bounded.
               Effect.retry({
                 while: (e) => e._tag === "ServiceNotActiveException",
-                schedule: Schedule.spaced("5 seconds").pipe(
-                  Schedule.both(Schedule.recurs(8)),
-                ),
+                schedule: Schedule.max([
+                  Schedule.spaced("5 seconds"),
+                  Schedule.recurs(8),
+                ]),
               }),
             );
           const service = updated.service;