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

package/src/AWS/Lambda/RuntimeExtension.ts

@@ -0,0 +1,46 @@
+/**
+ * Self-registered *internal extension* for the generated Lambda entry.
+ *
+ * Registering an internal extension buys the Shutdown phase: a sandbox
+ * with no registered extensions is killed with no signal at all (0 ms);
+ * with an internal extension Lambda sends SIGTERM and allows 500 ms before
+ * SIGKILL — the entry closes the instance scope in that window.
+ *
+ * The extension deliberately subscribes to NO events (`events: []`).
+ * Subscribing to `INVOKE` and holding `/event/next` open as a
+ * post-response work window was tried and rejected: a buffered Function
+ * URL does not return the response to the caller until the entire Invoke
+ * phase completes, so held work showed up as response latency anyway — and
+ * environments whose invoke phase was extended this way were observed
+ * being condemned and recycled (no END/REPORT, SIGTERM within seconds,
+ * fresh INIT on the next request). Per-invocation cleanup therefore
+ * settles inline in the dispatch; keep request finalizers fast.
+ *
+ * A registered extension must signal readiness via the blocking
+ * `/event/next` long-poll or the Init phase hangs; for an extension
+ * subscribed to no events that call never resolves, so it is fired
+ * un-awaited and parks for the sandbox's lifetime.
+ *
+ * https://docs.aws.amazon.com/lambda/latest/dg/runtimes-extensions-api.html
+ */
+export const registerLambdaExtension = async (): Promise<void> => {
+  const api = process.env.AWS_LAMBDA_RUNTIME_API;
+  if (!api) return;
+  const base = `http://${api}/2020-01-01/extension`;
+  try {
+    const registration = await fetch(`${base}/register`, {
+      method: "POST",
+      headers: { "Lambda-Extension-Name": "alchemy-graceful-shutdown" },
+      body: JSON.stringify({ events: [] }),
+    });
+    const extensionId = registration.headers.get("lambda-extension-identifier");
+    if (extensionId) {
+      void fetch(`${base}/event/next`, {
+        headers: { "Lambda-Extension-Identifier": extensionId },
+      }).catch(() => undefined);
+    }
+  } catch {
+    // Not running on Lambda (or the Extensions API refused) — the function
+    // still works, it just gets no shutdown window.
+  }
+};

package/src/AWS/Organizations/Account.ts

@@ -329,9 +329,10 @@ const waitForCreateAccount = (requestId: string) =>
   }).pipe(
     Effect.retry({
       while: (error: any) => error?._tag === "CreateAccountInProgress",
-      schedule: Schedule.spaced("2 seconds").pipe(
-        Schedule.both(Schedule.recurs(120)),
-      ),
+      schedule: Schedule.max([
+        Schedule.spaced("2 seconds"),
+        Schedule.recurs(120),
+      ]),
     }),
   );
 
@@ -341,8 +342,6 @@ const retryAccountManagement = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
       while: (error: any) =>
         error?._tag === "TooManyRequestsException" ||
         error?._tag === "InternalServerException",
-      schedule: Schedule.exponential(200).pipe(
-        Schedule.both(Schedule.recurs(8)),
-      ),
+      schedule: Schedule.max([Schedule.exponential(200), Schedule.recurs(8)]),
     }),
   );

package/src/AWS/Organizations/common.ts

@@ -55,9 +55,7 @@ export const retryOrganizations = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
         error?._tag === "TooManyRequestsException" ||
         error?._tag === "ServiceException" ||
         error?._tag === "FinalizingOrganizationException",
-      schedule: Schedule.exponential(200).pipe(
-        Schedule.both(Schedule.recurs(8)),
-      ),
+      schedule: Schedule.max([Schedule.exponential(200), Schedule.recurs(8)]),
     }),
   );
 

package/src/AWS/Providers.ts

@@ -442,26 +442,28 @@ const awsRetryFactory: RetryFactory = (lastError) => ({
     isThrottlingError(error) ||
     isRetryable(error) ||
     isHttpTransportError(error),
-  schedule: pipe(
-    Schedule.exponential(Duration.millis(200), 2),
-    Schedule.modifyDelay(
-      Effect.fn(function* (duration) {
-        const error = yield* Ref.get(lastError);
-        if (isThrottlingError(error)) {
-          // Throttling: floor at 500ms (matches distilled default).
-          if (Duration.toMillis(duration) < 500) {
-            return Duration.toMillis(Duration.millis(500));
+  // Transient transport failures (e.g. a sustained `read ETIMEDOUT` blip
+  // against a control-plane endpoint) can outlast a 10-attempt budget. With
+  // the 5s cap below, the extra attempts add bounded backoff while making
+  // the network-flake recovery materially more robust.
+  schedule: Schedule.max([
+    pipe(
+      Schedule.exponential(Duration.millis(200), 2),
+      Schedule.modifyDelay(
+        Effect.fn(function* ({ duration }) {
+          const error = yield* Ref.get(lastError);
+          if (isThrottlingError(error)) {
+            // Throttling: floor at 500ms (matches distilled default).
+            if (Duration.toMillis(duration) < 500) {
+              return Duration.toMillis(Duration.millis(500));
+            }
           }
-        }
-        return Duration.toMillis(duration);
-      }),
+          return Duration.toMillis(duration);
+        }),
+      ),
+      capped(Duration.seconds(5)),
+      jittered,
     ),
-    capped(Duration.seconds(5)),
-    jittered,
-    // Transient transport failures (e.g. a sustained `read ETIMEDOUT` blip
-    // against a control-plane endpoint) can outlast a 10-attempt budget. With
-    // the 5s cap above, the extra attempts add bounded backoff while making
-    // the network-flake recovery materially more robust.
-    Schedule.both(Schedule.recurs(15)),
-  ),
+    Schedule.recurs(15),
+  ]),
 });

package/src/AWS/RDS/DBCluster.ts

@@ -456,9 +456,10 @@ export const DBClusterProvider = () =>
         clusterId: string,
         { requireAvailable = true }: { requireAvailable?: boolean } = {},
       ) {
-        const readinessPolicy = Schedule.fixed("10 seconds").pipe(
-          Schedule.both(Schedule.recurs(60)),
-        );
+        const readinessPolicy = Schedule.max([
+          Schedule.fixed("10 seconds"),
+          Schedule.recurs(60),
+        ]);
         return yield* readCluster(clusterId).pipe(
           Effect.flatMap((cluster) => {
             if (!cluster?.DBClusterArn) {
@@ -762,9 +763,10 @@ export const DBClusterProvider = () =>
                 ),
               ),
             {
-              schedule: Schedule.fixed("15 seconds").pipe(
-                Schedule.both(Schedule.recurs(40)),
-              ),
+              schedule: Schedule.max([
+                Schedule.fixed("15 seconds"),
+                Schedule.recurs(40),
+              ]),
               until: (exists) => exists === false,
             },
           ).pipe(Effect.catch(() => Effect.void));

package/src/AWS/RDS/DBInstance.ts

@@ -421,9 +421,10 @@ export const DBInstanceProvider = () =>
         instanceId: string,
         { requireAvailable = true }: { requireAvailable?: boolean } = {},
       ) {
-        const readinessPolicy = Schedule.fixed("10 seconds").pipe(
-          Schedule.both(Schedule.recurs(60)),
-        );
+        const readinessPolicy = Schedule.max([
+          Schedule.fixed("10 seconds"),
+          Schedule.recurs(60),
+        ]);
         return yield* readInstance(instanceId).pipe(
           Effect.flatMap((instance) => {
             if (!instance?.DBInstanceArn) {
@@ -728,9 +729,10 @@ export const DBInstanceProvider = () =>
                 ),
               ),
             {
-              schedule: Schedule.fixed("15 seconds").pipe(
-                Schedule.both(Schedule.recurs(40)),
-              ),
+              schedule: Schedule.max([
+                Schedule.fixed("15 seconds"),
+                Schedule.recurs(40),
+              ]),
               until: (exists) => exists === false,
             },
           ).pipe(Effect.catch(() => Effect.void));

package/src/AWS/RDS/DBProxy.ts

@@ -133,9 +133,10 @@ export const DBProxyProvider = () =>
       });
 
       const waitForProxy = Effect.fn(function* (name: string) {
-        const readinessPolicy = Schedule.fixed("2 seconds").pipe(
-          Schedule.both(Schedule.recurs(30)),
-        );
+        const readinessPolicy = Schedule.max([
+          Schedule.fixed("2 seconds"),
+          Schedule.recurs(30),
+        ]);
         return yield* readProxy(name).pipe(
           Effect.flatMap((proxy) =>
             proxy?.DBProxyArn

package/src/AWS/RDS/DBProxyEndpoint.ts

@@ -119,9 +119,10 @@ export const DBProxyEndpointProvider = () =>
         dbProxyName: string;
         dbProxyEndpointName: string;
       }) {
-        const readinessPolicy = Schedule.fixed("2 seconds").pipe(
-          Schedule.both(Schedule.recurs(30)),
-        );
+        const readinessPolicy = Schedule.max([
+          Schedule.fixed("2 seconds"),
+          Schedule.recurs(30),
+        ]);
         return yield* readEndpoint(props).pipe(
           Effect.flatMap((endpoint) =>
             endpoint?.DBProxyEndpointArn

package/src/AWS/Route53/HealthCheck.ts

@@ -313,9 +313,10 @@ export const HealthCheckProvider = () =>
                 // Optimistic-lock retry: re-read for the latest version.
                 Effect.retry({
                   while: (e) => e._tag === "HealthCheckVersionMismatch",
-                  schedule: Schedule.fixed("1 second").pipe(
-                    Schedule.both(Schedule.recurs(5)),
-                  ),
+                  schedule: Schedule.max([
+                    Schedule.fixed("1 second"),
+                    Schedule.recurs(5),
+                  ]),
                 }),
               );
             check = updated;
@@ -337,9 +338,10 @@ export const HealthCheckProvider = () =>
             // Still referenced by a record whose delete is propagating.
             Effect.retry({
               while: (e) => e._tag === "HealthCheckInUse",
-              schedule: Schedule.fixed("3 seconds").pipe(
-                Schedule.both(Schedule.recurs(10)),
-              ),
+              schedule: Schedule.max([
+                Schedule.fixed("3 seconds"),
+                Schedule.recurs(10),
+              ]),
             }),
             Effect.catchTag("HealthCheckInUse", () => Effect.void),
           );

package/src/AWS/Route53/HostedZone.ts

@@ -124,9 +124,10 @@ export const HostedZoneProvider = () =>
             Effect.map((r) => r.ChangeInfo.Status),
             Effect.catchTag("NoSuchChange", () => Effect.succeed("PENDING")),
             Effect.repeat({
-              schedule: Schedule.fixed("2 seconds").pipe(
-                Schedule.both(Schedule.recurs(60)),
-              ),
+              schedule: Schedule.max([
+                Schedule.fixed("2 seconds"),
+                Schedule.recurs(60),
+              ]),
               until: (status) => status === "INSYNC",
             }),
           );
@@ -384,9 +385,10 @@ export const HostedZoneProvider = () =>
             // in case a referencing record's delete is still propagating.
             Effect.retry({
               while: (e) => e._tag === "PriorRequestNotComplete",
-              schedule: Schedule.fixed("2 seconds").pipe(
-                Schedule.both(Schedule.recurs(10)),
-              ),
+              schedule: Schedule.max([
+                Schedule.fixed("2 seconds"),
+                Schedule.recurs(10),
+              ]),
             }),
           );
         }),

package/src/AWS/Route53/Record.ts

@@ -487,9 +487,10 @@ export const RecordProvider = () =>
             Effect.map((response) => response.ChangeInfo.Status),
             Effect.catchTag("NoSuchChange", () => Effect.succeed("PENDING")),
             Effect.repeat({
-              schedule: Schedule.fixed("2 seconds").pipe(
-                Schedule.both(Schedule.recurs(60)),
-              ),
+              schedule: Schedule.max([
+                Schedule.fixed("2 seconds"),
+                Schedule.recurs(60),
+              ]),
               until: (status) => status === "INSYNC",
             }),
           );

package/src/AWS/S3/Bucket.ts

@@ -543,7 +543,7 @@ export const BucketProvider = () =>
         // Wait for bucket to exist (eventual consistency)
         yield* Effect.retry(
           s3.headBucket({ Bucket: bucketName }),
-          Schedule.exponential(100).pipe(Schedule.both(Schedule.recurs(10))),
+          Schedule.max([Schedule.exponential(100), Schedule.recurs(10)]),
         );
         yield* Effect.logInfo(
           `S3 Bucket create: bucket is available ${bucketName}`,
@@ -1544,9 +1544,10 @@ export const BucketProvider = () =>
                 Effect.catchTag("NoSuchBucket", () => Effect.void),
                 Effect.retry({
                   while: (e) => e._tag === "BucketNotEmpty",
-                  schedule: Schedule.exponential(100).pipe(
-                    Schedule.both(Schedule.recurs(5)),
-                  ),
+                  schedule: Schedule.max([
+                    Schedule.exponential(100),
+                    Schedule.recurs(5),
+                  ]),
                 }),
               );
           });

package/src/AWS/SQS/Queue.ts

@@ -517,9 +517,9 @@ export const QueueProvider = () =>
                 Effect.retry({
                   while: (e) => e._tag === "QueueDeletedRecently",
                   schedule: Schedule.fixed(1000).pipe(
-                    Schedule.tapOutput((i) =>
+                    Schedule.tap(({ attempt }) =>
                       session.note(
-                        `Queue was deleted recently, retrying... ${i + 1}s`,
+                        `Queue was deleted recently, retrying... ${attempt}s`,
                       ),
                     ),
                   ),
@@ -531,9 +531,10 @@ export const QueueProvider = () =>
                 // genuine validation failure, so retry on a bounded schedule.
                 Effect.retry({
                   while: (e) => e._tag === "InvalidParameterValueException",
-                  schedule: Schedule.fixed(1000).pipe(
-                    Schedule.both(Schedule.recurs(30)),
-                  ),
+                  schedule: Schedule.max([
+                    Schedule.fixed(1000),
+                    Schedule.recurs(30),
+                  ]),
                 }),
                 Effect.catchTag("QueueNameExists", () =>
                   sqs.getQueueUrl({ QueueName: queueName }),
@@ -558,9 +559,10 @@ export const QueueProvider = () =>
             .pipe(
               Effect.retry({
                 while: (e) => e._tag === "QueueDoesNotExist",
-                schedule: Schedule.fixed(1000).pipe(
-                  Schedule.both(Schedule.recurs(30)),
-                ),
+                schedule: Schedule.max([
+                  Schedule.fixed(1000),
+                  Schedule.recurs(30),
+                ]),
               }),
               Effect.map((r) => r.Attributes ?? {}),
             );
@@ -588,9 +590,10 @@ export const QueueProvider = () =>
               .pipe(
                 Effect.retry({
                   while: (e) => e._tag === "QueueDoesNotExist",
-                  schedule: Schedule.fixed(1000).pipe(
-                    Schedule.both(Schedule.recurs(30)),
-                  ),
+                  schedule: Schedule.max([
+                    Schedule.fixed(1000),
+                    Schedule.recurs(30),
+                  ]),
                 }),
               );
           }
@@ -603,9 +606,10 @@ export const QueueProvider = () =>
             .pipe(
               Effect.retry({
                 while: (e) => e._tag === "QueueDoesNotExist",
-                schedule: Schedule.fixed(1000).pipe(
-                  Schedule.both(Schedule.recurs(30)),
-                ),
+                schedule: Schedule.max([
+                  Schedule.fixed(1000),
+                  Schedule.recurs(30),
+                ]),
               }),
               Effect.map((r) => r.Tags ?? {}),
               Effect.catch(() => Effect.succeed({} as Record<string, string>)),
@@ -631,9 +635,10 @@ export const QueueProvider = () =>
               .pipe(
                 Effect.retry({
                   while: (e) => e._tag === "QueueDoesNotExist",
-                  schedule: Schedule.fixed(1000).pipe(
-                    Schedule.both(Schedule.recurs(30)),
-                  ),
+                  schedule: Schedule.max([
+                    Schedule.fixed(1000),
+                    Schedule.recurs(30),
+                  ]),
                 }),
               );
           }
@@ -643,9 +648,10 @@ export const QueueProvider = () =>
               .pipe(
                 Effect.retry({
                   while: (e) => e._tag === "QueueDoesNotExist",
-                  schedule: Schedule.fixed(1000).pipe(
-                    Schedule.both(Schedule.recurs(30)),
-                  ),
+                  schedule: Schedule.max([
+                    Schedule.fixed(1000),
+                    Schedule.recurs(30),
+                  ]),
                 }),
               );
           }

package/src/AWS/StateStore/State.ts

@@ -416,7 +416,7 @@ const ensureStateBucket = (bucket: string, region: string) =>
       .headBucket({ Bucket: bucket })
       .pipe(
         Effect.retry(
-          Schedule.spaced("1 second").pipe(Schedule.both(Schedule.recurs(15))),
+          Schedule.max([Schedule.spaced("1 second"), Schedule.recurs(15)]),
         ),
       );
   }).pipe(
@@ -430,8 +430,9 @@ const ensureStateBucket = (bucket: string, region: string) =>
         e._tag === "OperationAborted" ||
         e._tag === "NoSuchBucket" ||
         e._tag === "NotFound",
-      schedule: Schedule.spaced("2 seconds").pipe(
-        Schedule.both(Schedule.recurs(10)),
-      ),
+      schedule: Schedule.max([
+        Schedule.spaced("2 seconds"),
+        Schedule.recurs(10),
+      ]),
     }),
   );

package/src/AWS/Website/AssetDeployment.ts

@@ -380,12 +380,16 @@ const retryForBucketReadiness = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
   effect.pipe(
     Effect.retry({
       while: isMissingBucket,
-      schedule: Schedule.exponential("100 millis").pipe(
-        Schedule.both(Schedule.recurs(30)),
-        Schedule.map(([duration]) =>
-          Duration.isGreaterThan(duration, Duration.seconds(2))
-            ? Duration.seconds(2)
-            : duration,
+      schedule: Schedule.max([
+        Schedule.exponential("100 millis"),
+        Schedule.recurs(30),
+      ]).pipe(
+        Schedule.modifyDelay(({ duration }) =>
+          Effect.succeed(
+            Duration.isGreaterThan(duration, Duration.seconds(2))
+              ? Duration.seconds(2)
+              : duration,
+          ),
         ),
       ),
     }),

package/src/Apply.ts

@@ -584,6 +584,7 @@ const executeNode = (
           attr = yield* node.provider
             .precreate({
               id: logicalId,
+              fqn,
               news: node.props,
               session: scopedSession,
               instanceId,
@@ -643,6 +644,7 @@ const executeNode = (
         attr = yield* node.provider
           .reconcile({
             id: logicalId,
+            fqn,
             news,
             instanceId,
             bindings: bindingOutputs,
@@ -765,6 +767,7 @@ const executeNode = (
         const attr = yield* node.provider
           .reconcile({
             id: logicalId,
+            fqn,
             news,
             instanceId,
             bindings: bindingOutputs,
@@ -887,6 +890,7 @@ const executeNode = (
               yield* node.provider
                 .delete({
                   id: logicalId,
+                  fqn,
                   instanceId: old.instanceId,
                   olds: old.props as never,
                   output: old.attr,
@@ -933,6 +937,7 @@ const executeNode = (
           attr = yield* node.provider
             .precreate({
               id: logicalId,
+              fqn,
               news: node.props,
               session: scopedSession,
               instanceId,
@@ -993,6 +998,7 @@ const executeNode = (
         attr = yield* node.provider
           .reconcile({
             id: logicalId,
+            fqn,
             news,
             instanceId,
             bindings: bindingOutputs,
@@ -1346,6 +1352,7 @@ const converge = Effect.fn(function* (
       const attr = yield* node.provider
         .reconcile({
           id: logicalId,
+          fqn,
           news: newProps,
           instanceId,
           bindings: newBindings,
@@ -1648,6 +1655,7 @@ const collectGarbage = Effect.fn(function* (
               yield* provider
                 .delete({
                   id: logicalId,
+                  fqn,
                   instanceId,
                   olds: props as never,
                   output: attr,

package/src/Auth/AuthProvider.ts

@@ -5,6 +5,17 @@ import * as Schema from "effect/Schema";
 import * as Semaphore from "effect/Semaphore";
 import { withLock } from "./Lock.ts";
 
+/**
+ * Canonical web host for OAuth provider-agnostic landing pages
+ * (`/auth/success`, `/auth/error`). The CLI's loopback server 302s the
+ * browser to one of these after handling the OAuth callback. Centralized
+ * here so the redirect target lives in exactly one place across all
+ * provider OAuth clients.
+ */
+export const AUTH_LANDING_HOST = "https://v2.alchemy.run";
+export const AUTH_SUCCESS_URL = `${AUTH_LANDING_HOST}/auth/success`;
+export const AUTH_ERROR_URL = `${AUTH_LANDING_HOST}/auth/error`;
+
 /**
  * Methods on an {@link AuthProviderImpl} that mutate (or could trigger
  * mutation of) on-disk credentials. The factory wraps these in a

package/src/Axiom/AuthProvider.ts

@@ -328,9 +328,6 @@ export const AxiomAuth = AuthProviderLayer<
             Match.exhaustive,
           );
         }),
-        Effect.catch((e) =>
-          Console.error(`  Failed to retrieve credentials: ${e}`),
-        ),
       );
 
     return {

package/src/Bundle/Vite.ts

@@ -1,6 +1,5 @@
 import type { NonEmptyArray } from "effect/Array";
 import * as Cause from "effect/Cause";
-import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
@@ -45,11 +44,18 @@ export const viteBuildOutputPlugin = Effect.fn(function* ({
     string,
     Effect.Effect<BundleFile, BundleError>
   >();
-  const deferred = yield* Deferred.make<ViteBuildOutput, BundleError>();
 
   const plugin: vite.Plugin = {
     name: "alchemy:build-output",
     sharedDuringBuild: true,
+    // Collect the client output directory and server chunks as each
+    // environment writes its bundle. We deliberately do NOT resolve the build
+    // result from a `buildApp` hook: on Vite 8, when a project declares no
+    // `builder.buildApp` (e.g. a plain client-only SPA), `builder.buildApp()`
+    // runs post-order `buildApp` hooks *before* the default environment builds,
+    // so a hook fires while the output is still empty (issue #792). Instead,
+    // `viteBuild` reads `output` *after* `builder.buildApp()` resolves — by
+    // which point every environment that actually built has run `writeBundle`.
     async writeBundle(_, bundle) {
       if (this.environment.name === "client") {
         clientDirectory = path.resolve(
@@ -107,18 +113,6 @@ export const viteBuildOutputPlugin = Effect.fn(function* ({
         }),
       );
     },
-    buildApp: {
-      order: "post",
-      async handler() {
-        Deferred.doneUnsafe(
-          deferred,
-          Effect.succeed({
-            clientDirectory,
-            serverBundle: makeServerBundle(),
-          }),
-        );
-      },
-    },
   };
 
   // The server bundle may include chunks from more than one Vite environment, so we need to prefix them with the environment-specific output directory.
@@ -199,6 +193,13 @@ export const viteBuildOutputPlugin = Effect.fn(function* ({
 
   return {
     plugin,
-    output: Deferred.await(deferred),
+    // Read lazily so callers observe the state collected during the build.
+    // Only safe to await *after* `builder.buildApp()` has resolved.
+    output: Effect.sync(
+      (): ViteBuildOutput => ({
+        clientDirectory,
+        serverBundle: makeServerBundle(),
+      }),
+    ),
   };
 });