alchemy 2.0.0-beta.51 → 2.0.0-beta.53

package/src/AWS/EventBridge/PutEvents.ts

@@ -1,4 +1,3 @@
-import { Region } from "@distilled.cloud/aws/Region";
 import * as eventbridge from "@distilled.cloud/aws/eventbridge";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
@@ -61,11 +60,11 @@ export class PutEventsPolicy extends Binding.Policy<
 
 export const PutEventsPolicyLive = PutEventsPolicy.layer.effect(
   Effect.gen(function* () {
-    const region = yield* Region;
-    const { accountId } = yield* AWSEnvironment;
+    const env = yield* AWSEnvironment;
 
     return Effect.fn(function* (host, bus?: EventBus) {
       if (isFunction(host)) {
+        const { accountId, region } = yield* env;
         const resource = bus
           ? yield* yield* bus.eventBusArn
           : (`arn:aws:events:${region}:${accountId}:event-bus/default` as const);

package/src/AWS/EventBridge/Rule.ts

@@ -1,4 +1,3 @@
-import { Region } from "@distilled.cloud/aws/Region";
 import * as eventbridge from "@distilled.cloud/aws/eventbridge";
 import * as Effect from "effect/Effect";
 import { Unowned } from "../../AdoptPolicy.ts";
@@ -7,7 +6,6 @@ import type { Input } from "../../Input.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
-import type { Providers } from "../Providers.ts";
 import {
   createInternalTags,
   createTagsList,
@@ -15,6 +13,7 @@ import {
   hasAlchemyTags,
 } from "../../Tags.ts";
 import { AWSEnvironment, type AccountID } from "../Environment.ts";
+import type { Providers } from "../Providers.ts";
 import type { RegionID } from "../Region.ts";
 
 export type {
@@ -273,9 +272,6 @@ export const RuleProvider = () =>
   Provider.effect(
     Rule,
     Effect.gen(function* () {
-      const region = yield* Region;
-      const { accountId } = yield* AWSEnvironment;
-
       const createRuleName = (id: string, props: { name?: string } = {}) => {
         if (props.name) {
           return Effect.succeed(props.name);
@@ -302,6 +298,7 @@ export const RuleProvider = () =>
           }
         }),
         read: Effect.fn(function* ({ id, olds, output }) {
+          const { accountId, region } = yield* AWSEnvironment.current;
           const ruleName =
             output?.ruleName ?? (yield* createRuleName(id, olds));
           const eventBusName =
@@ -342,6 +339,7 @@ export const RuleProvider = () =>
             : Unowned(attrs);
         }),
         reconcile: Effect.fn(function* ({ id, news = {}, output, session }) {
+          const { accountId, region } = yield* AWSEnvironment.current;
           yield* validateRuleProps(news);
           const ruleName =
             output?.ruleName ?? (yield* createRuleName(id, news));

package/src/AWS/IAM/OpenIDConnectProvider.ts

@@ -73,9 +73,13 @@ export const OpenIDConnectProviderProvider = () =>
   Provider.effect(
     OpenIDConnectProvider,
     Effect.gen(function* () {
-      const { accountId } = yield* AWSEnvironment;
       const oidcArnFromUrl = (url: string) =>
-        `arn:aws:iam::${accountId}:oidc-provider/${url.replace(/^https?:\/\//, "")}`;
+        AWSEnvironment.current.pipe(
+          Effect.map(
+            ({ accountId }) =>
+              `arn:aws:iam::${accountId}:oidc-provider/${url.replace(/^https?:\/\//, "")}`,
+          ),
+        );
 
       const readProvider = Effect.fn(function* (providerArn: string) {
         const response = yield* iam
@@ -100,7 +104,8 @@ export const OpenIDConnectProviderProvider = () =>
         }),
         read: Effect.fn(function* ({ olds, output }) {
           const providerArn =
-            output?.openIDConnectProviderArn ?? oidcArnFromUrl(olds.url);
+            output?.openIDConnectProviderArn ??
+            (yield* oidcArnFromUrl(olds.url));
           const provider = yield* readProvider(providerArn);
           if (!provider?.Url) {
             return undefined;
@@ -120,7 +125,8 @@ export const OpenIDConnectProviderProvider = () =>
           // The OIDC provider's ARN is deterministic from its URL, so we
           // can observe with or without prior output.
           const providerArn =
-            output?.openIDConnectProviderArn ?? oidcArnFromUrl(news.url);
+            output?.openIDConnectProviderArn ??
+            (yield* oidcArnFromUrl(news.url));
 
           // Observe — read the live provider; absent when missing.
           let observed = yield* readProvider(providerArn);

package/src/AWS/IAM/Policy.ts

@@ -113,14 +113,13 @@ export const PolicyProvider = () =>
   Provider.effect(
     Policy,
     Effect.gen(function* () {
-      const { accountId } = yield* AWSEnvironment;
-
       const toPolicyName = (id: string, props: PolicyProps) =>
         props.policyName
           ? Effect.succeed(props.policyName)
           : createPhysicalName({ id, maxLength: 128 });
 
       const toPolicyArn = Effect.fn(function* (id: string, props: PolicyProps) {
+        const { accountId } = yield* AWSEnvironment.current;
         const policyName = yield* toPolicyName(id, props);
         return policyArnFromParts({
           accountId,

package/src/AWS/IAM/Role.ts

@@ -5,7 +5,6 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
-import type { Providers } from "../Providers.ts";
 import {
   createInternalTags,
   createTagsList,
@@ -14,6 +13,7 @@ import {
 } from "../../Tags.ts";
 import type { AccountID } from "../Environment.ts";
 import { AWSEnvironment } from "../Environment.ts";
+import type { Providers } from "../Providers.ts";
 import type { PolicyDocument } from "./Policy.ts";
 import {
   parsePolicyDocument,
@@ -431,7 +431,7 @@ export const RoleProvider = () =>
           const liveRole = yield* iam.getRole({ RoleName: roleName });
           const roleArn = (liveRole.Role?.Arn ??
             observedRole.Role?.Arn ??
-            `arn:aws:iam::${(yield* AWSEnvironment).accountId}:role/${roleName}`) as RoleArn;
+            `arn:aws:iam::${(yield* AWSEnvironment.current).accountId}:role/${roleName}`) as RoleArn;
 
           yield* session.note(roleArn);
           return {

package/src/AWS/IAM/SAMLProvider.ts

@@ -1,12 +1,12 @@
 import * as iam from "@distilled.cloud/aws/iam";
 import * as Effect from "effect/Effect";
 import * as Redacted from "effect/Redacted";
-import { AWSEnvironment } from "../Environment.ts";
 import { isResolved } from "../../Diff.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
-import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags, hasTags } from "../../Tags.ts";
+import { AWSEnvironment } from "../Environment.ts";
+import type { Providers } from "../Providers.ts";
 import { toTagRecord, unwrapRedactedString } from "./common.ts";
 
 export interface SAMLProviderProps {
@@ -107,7 +107,7 @@ export const SAMLProviderProvider = () =>
         ...internalTags,
         ...news.tags,
       };
-      const accountId = (yield* AWSEnvironment).accountId;
+      const accountId = (yield* AWSEnvironment.current).accountId;
       const samlProviderArn =
         output?.samlProviderArn ??
         `arn:aws:iam::${accountId}:saml-provider/${news.name}`;

package/src/AWS/Kinesis/Stream.ts

@@ -1,7 +1,6 @@
 // required to avoid this error in consumers: "The inferred type of 'Records' cannot be named without a reference to '../../@distilled.cloud/aws/node_modules/@types/aws-lambda'. This is likely not portable. A type annotation is necessary.ts(2742)"
 export type * as lambda from "aws-lambda";
 
-import { Region } from "@distilled.cloud/aws/Region";
 import * as kinesis from "@distilled.cloud/aws/kinesis";
 import type * as lambda from "aws-lambda";
 import * as Effect from "effect/Effect";
@@ -11,7 +10,6 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
-import type { Providers } from "../Providers.ts";
 import {
   createInternalTags,
   diffTags,
@@ -19,6 +17,7 @@ import {
   type Tags,
 } from "../../Tags.ts";
 import { AWSEnvironment, type AccountID } from "../Environment.ts";
+import type { Providers } from "../Providers.ts";
 import type { RegionID } from "../Region.ts";
 
 export type StreamRecord = lambda.KinesisStreamRecord;
@@ -424,9 +423,6 @@ export const StreamProvider = () =>
   Provider.effect(
     Stream,
     Effect.gen(function* () {
-      const region = yield* Region;
-      const { accountId } = yield* AWSEnvironment;
-
       return {
         stables: ["streamName", "streamArn"],
         read: Effect.fn(function* ({ id, olds, output }) {
@@ -450,6 +446,7 @@ export const StreamProvider = () =>
           }
         }),
         reconcile: Effect.fn(function* ({ id, news = {}, output, session }) {
+          const { accountId, region } = yield* AWSEnvironment.current;
           yield* assertProvisionedProps(news);
 
           const streamName =

package/src/AWS/Lambda/EventSourceMapping.ts

@@ -1,5 +1,4 @@
 import * as lambda from "@distilled.cloud/aws/lambda";
-import { Region } from "@distilled.cloud/aws/Region";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as Schedule from "effect/Schedule";
@@ -7,9 +6,9 @@ import * as Stream from "effect/Stream";
 import { deepEqual, isResolved } from "../../Diff.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
-import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags, hasTags } from "../../Tags.ts";
 import { AWSEnvironment } from "../Environment.ts";
+import type { Providers } from "../Providers.ts";
 
 export type StartingPosition = "TRIM_HORIZON" | "LATEST" | "AT_TIMESTAMP";
 
@@ -179,9 +178,6 @@ export const EventSourceMappingProvider = () =>
   Provider.effect(
     EventSourceMapping,
     Effect.gen(function* () {
-      const region = yield* Region;
-      const { accountId } = yield* AWSEnvironment;
-
       const createEventSourceMappingTags = Effect.fn(function* (id: string) {
         const internalTags = yield* createInternalTags(id);
         return {
@@ -293,6 +289,7 @@ export const EventSourceMappingProvider = () =>
           }
         }),
         reconcile: Effect.fn(function* ({ id, news, output, session }) {
+          const { accountId, region } = yield* AWSEnvironment.current;
           const expectedInternalTags = yield* createEventSourceMappingTags(id);
           const desiredTags = { ...expectedInternalTags, ...news.tags };
 

package/src/AWS/Lambda/Function.ts

@@ -153,7 +153,7 @@ export interface Function extends Resource<
   Providers
 > {}
 
-export type FunctionServices = Credentials | Region;
+export type FunctionServices = Credentials | Region | AWSEnvironment;
 
 export type FunctionShape = Main<FunctionServices>;
 
@@ -456,6 +456,7 @@ export const Function: Platform<
           }
         }),
       serve: (handler: HttpEffect) =>
+        // @ts-ignore
         ctx.listen(makeFunctionHttpHandler(handler)),
       listen: ((
         handler:
@@ -500,8 +501,7 @@ export const FunctionProvider = () =>
     Function,
     Effect.gen(function* () {
       const stack = yield* Stack;
-      const { accountId } = yield* AWSEnvironment;
-      const region = yield* Region;
+
       const fs = yield* FileSystem.FileSystem;
       const virtualEntryPlugin = yield* Bundle.virtualEntryPlugin;
       const alchemyEnv = {
@@ -530,6 +530,7 @@ export const FunctionProvider = () =>
 
       const createNames = (id: string, functionName: string | undefined) =>
         Effect.gen(function* () {
+          const { accountId, region } = yield* AWSEnvironment.current;
           const roleName = yield* createRoleName(id);
           const policyName = yield* createPolicyName(id);
           const fn = yield* createFunctionName(id, functionName);
@@ -663,7 +664,6 @@ export const FunctionProvider = () =>
         id: string,
         props: FunctionProps,
       ) {
-        const handler = props.handler ?? "default";
         const sourcemap = props.build?.output?.sourcemap ?? true;
         const uploadSourceMap = props.uploadSourceMap ?? true;
 
@@ -885,10 +885,10 @@ export default await Effect.runPromise(handlerEffect)
           if (assets) {
             const key = yield* assets.uploadAsset(hash, archive);
             yield* Effect.logDebug(
-              `Using S3 for code: s3://${assets.bucketName}/${key}`,
+              `Using S3 for code: s3://${yield* assets.bucketName}/${key}`,
             );
             return {
-              S3Bucket: assets.bucketName,
+              S3Bucket: yield* assets.bucketName,
               S3Key: key,
             } as const;
           } else {
@@ -1220,6 +1220,7 @@ export default await Effect.runPromise(handlerEffect)
         }),
 
         precreate: Effect.fnUntraced(function* ({ id, news, session }) {
+          const { accountId, region } = yield* AWSEnvironment.current;
           const { roleName, functionName, roleArn } = yield* createNames(
             id,
             news.functionName,
@@ -1381,9 +1382,10 @@ export default await Effect.runPromise(handlerEffect)
           return null as any;
         }),
         tail: ({ output }) => {
-          const logGroupArn = `arn:aws:logs:${region}:${accountId}:log-group:/aws/lambda/${output.functionName}`;
-
           const runTailSession = Effect.gen(function* () {
+            const { accountId, region } = yield* AWSEnvironment.current;
+
+            const logGroupArn = `arn:aws:logs:${region}:${accountId}:log-group:/aws/lambda/${output.functionName}`;
             const response = yield* logs.startLiveTail({
               logGroupIdentifiers: [logGroupArn],
             });

package/src/AWS/Lambda/Permission.ts

@@ -90,7 +90,7 @@ export interface Permission extends Resource<
  *   functionName: yield* fn.functionArn(),
  *   principal: "s3.amazonaws.com",
  *   sourceArn: yield* bucket.bucketArn,
- *   sourceAccount: (yield* AWSEnvironment).accountId,
+ *   sourceAccount: (yield* AWSEnvironment.current).accountId,
  * });
  * ```
  *

package/src/AWS/Logs/LogGroup.ts

@@ -1,14 +1,13 @@
 import * as logs from "@distilled.cloud/aws/cloudwatch-logs";
-import { Region } from "@distilled.cloud/aws/Region";
 import * as Effect from "effect/Effect";
 import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
-import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags } from "../../Tags.ts";
 import type { AccountID } from "../Environment.ts";
 import { AWSEnvironment } from "../Environment.ts";
+import type { Providers } from "../Providers.ts";
 import type { RegionID } from "../Region.ts";
 
 export type LogGroupName = string;
@@ -65,9 +64,6 @@ export const LogGroupProvider = () =>
   Provider.effect(
     LogGroup,
     Effect.gen(function* () {
-      const region = yield* Region;
-      const { accountId } = yield* AWSEnvironment;
-
       const toLogGroupName = (
         id: string,
         props: { logGroupName?: string } = {},
@@ -109,6 +105,7 @@ export const LogGroupProvider = () =>
           };
         }),
         reconcile: Effect.fn(function* ({ id, news, output, session }) {
+          const { accountId, region } = yield* AWSEnvironment.current;
           const logGroupName =
             output?.logGroupName ?? (yield* toLogGroupName(id, news));
           const arn = (output?.logGroupArn ??

package/src/AWS/Providers.ts

@@ -18,8 +18,8 @@ import * as Schedule from "effect/Schedule";
 import * as HttpClientError from "effect/unstable/http/HttpClientError";
 import { CredentialsStoreLive } from "../Auth/Credentials.ts";
 import { Command, CommandProvider } from "../Build/Command.ts";
-import * as Provider from "../Provider.ts";
 import { KeyPair, KeyPairProvider } from "../KeyPair.ts";
+import * as Provider from "../Provider.ts";
 import { Random, RandomProvider } from "../Random.ts";
 import * as ACM from "./ACM/index.ts";
 import * as ApiGateway from "./ApiGateway/index.ts";
@@ -575,7 +575,7 @@ export const providers = () =>
         CommandProvider(),
         KeyPairProvider(),
         RandomProvider(),
-        Assets.AssetsProvider(),
+        Assets.AssetsLive,
       ),
     ),
     Layer.provideMerge(Region.fromEnvironment),

package/src/AWS/Region.ts

@@ -1,19 +1,31 @@
 import * as Region from "@distilled.cloud/aws/Region";
+import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import { AWSEnvironment } from "./Environment.ts";
 
 export { AWS_REGION, type RegionID } from "./Environment.ts";
 export { Region } from "@distilled.cloud/aws/Region";
 
-export const of = (region: string) => Layer.succeed(Region.Region, region);
+export const of = (region: string) =>
+  Layer.succeed(Region.Region, Effect.succeed(region));
 
 export const fromEnvOrElse = (region: string) =>
-  Layer.succeed(Region.Region, process.env.AWS_REGION ?? region);
+  Layer.succeed(
+    Region.Region,
+    Effect.succeed(process.env.AWS_REGION ?? region),
+  );
+
+export const CurrentRegion = AWSEnvironment.use((env) =>
+  Effect.flatMap(env, ({ region }) => Effect.succeed(region)),
+);
 
 /**
  * Derive the AWS region from the surrounding {@link AWSEnvironment}.
  */
 export const fromEnvironment = Layer.effect(
   Region.Region,
-  AWSEnvironment.useSync((env) => env.region),
+  Effect.gen(function* () {
+    const env = yield* AWSEnvironment;
+    return Effect.map(env, (env) => env.region);
+  }),
 );

package/src/AWS/S3/Bucket.ts

@@ -5,15 +5,17 @@ import * as Arr from "effect/Array";
 import * as Effect from "effect/Effect";
 import * as Order from "effect/Order";
 import * as Schedule from "effect/Schedule";
+import type { HttpClient } from "effect/unstable/http";
 import type { ScopedPlanStatusSession } from "../../Cli/Cli.ts";
 import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource, type ResourceBinding } from "../../Resource.ts";
-import type { Providers } from "../Providers.ts";
 import { diffTags } from "../../Tags.ts";
+import type { Credentials } from "../Credentials.ts";
 import { AWSEnvironment, type AccountID } from "../Environment.ts";
 import type { PolicyStatement } from "../IAM/Policy.ts";
+import type { Providers } from "../Providers.ts";
 import type { RegionID } from "../Region.ts";
 
 export type BucketName = string;
@@ -258,8 +260,8 @@ export const BucketProvider = () =>
         id: string;
         news: BucketProps;
       }) {
-        const region = yield* Region;
-        const { accountId } = yield* AWSEnvironment;
+        const { region } = yield* AWSEnvironment.current;
+        const { accountId } = yield* AWSEnvironment.current;
         const bucketName = yield* createBucketName(id, news);
 
         yield* Effect.logInfo(
@@ -343,18 +345,17 @@ export const BucketProvider = () =>
 
       const fetchBucketTags = (
         bucketName: string,
-      ): Effect.Effect<Record<string, string>, never, any> =>
+      ): Effect.Effect<
+        Record<string, string>,
+        never,
+        Credentials | HttpClient.HttpClient | Region
+      > =>
         s3.getBucketTagging({ Bucket: bucketName }).pipe(
-          Effect.map(
-            (r) =>
-              Object.fromEntries(
-                (r.TagSet ?? []).map((t) => [t.Key!, t.Value!]),
-              ) as Record<string, string>,
-          ),
-          Effect.catchTag("NoSuchTagSet", () =>
-            Effect.succeed({} as Record<string, string>),
+          Effect.map((r) =>
+            Object.fromEntries((r.TagSet ?? []).map((t) => [t.Key!, t.Value!])),
           ),
-          Effect.catch(() => Effect.succeed({} as Record<string, string>)),
+          Effect.catchTag("NoSuchTagSet", () => Effect.succeed({})),
+          Effect.catch(() => Effect.succeed({})),
         );
 
       const syncBucketTags = Effect.fnUntraced(function* ({
@@ -555,8 +556,7 @@ export const BucketProvider = () =>
         read: Effect.fn(function* ({ id, olds, output }) {
           const bucketName =
             output?.bucketName ?? (yield* createBucketName(id, olds ?? {}));
-          const region = yield* Region;
-          const { accountId } = yield* AWSEnvironment;
+          const { accountId, region } = yield* AWSEnvironment.current;
           const exists = yield* s3.headBucket({ Bucket: bucketName }).pipe(
             Effect.map(() => true),
             Effect.catchTag("NotFound", () => Effect.succeed(false)),

package/src/AWS/SQS/Queue.ts

@@ -1,4 +1,3 @@
-import { Region } from "@distilled.cloud/aws/Region";
 import * as sqs from "@distilled.cloud/aws/sqs";
 import * as Effect from "effect/Effect";
 import * as Schedule from "effect/Schedule";
@@ -161,8 +160,6 @@ export const QueueProvider = () =>
   Provider.effect(
     Queue,
     Effect.gen(function* () {
-      const region = yield* Region;
-      const { accountId } = yield* AWSEnvironment;
       const createQueueName = Effect.fnUntraced(function* (
         id: string,
         props: {
@@ -216,6 +213,7 @@ export const QueueProvider = () =>
       return Queue.Provider.of({
         stables: ["queueName", "queueUrl", "queueArn"],
         read: Effect.fn(function* ({ id, olds, output }) {
+          const { accountId, region } = yield* AWSEnvironment.current;
           const queueName =
             output?.queueName ?? (yield* createQueueName(id, olds ?? {}));
           const url = yield* sqs.getQueueUrl({ QueueName: queueName }).pipe(
@@ -259,6 +257,7 @@ export const QueueProvider = () =>
           session,
           bindings,
         }) {
+          const { accountId, region } = yield* AWSEnvironment.current;
           const queueName =
             output?.queueName ?? (yield* createQueueName(id, news));
           const queueArn =

package/src/AWS/index.ts

@@ -1,7 +1,6 @@
 export * from "./Arn.ts";
 export * from "./Assets.ts";
 export * from "./Bootstrap.ts";
-export * from "./Context.ts";
 export * from "./Environment.ts";
 export * from "./Providers.ts";
 

package/src/Apply.ts

@@ -1544,7 +1544,20 @@ const collectGarbage = Effect.fnUntraced(function* (
               });
             }
 
-            if (attr !== undefined) {
+            // Honor `retain` for the old generation of a replacement, mirroring
+            // the orphan-delete path above. Delete-node retain is already
+            // handled with an early return; this guards the replaced
+            // old-generation physical delete.
+            const retainOldGeneration =
+              !isDeleteNode(node) && node.removalPolicy === "retain";
+
+            if (retainOldGeneration) {
+              yield* scopedSession.note(
+                "Retaining replaced resource (removal policy: retain)...",
+              );
+            }
+
+            if (attr !== undefined && !retainOldGeneration) {
               yield* provider
                 .delete({
                   id: logicalId,
@@ -1573,7 +1586,9 @@ const collectGarbage = Effect.fnUntraced(function* (
               });
               yield* report("deleted");
             } else {
-              yield* scopedSession.note("Cleaning up replaced resource...");
+              if (!retainOldGeneration) {
+                yield* scopedSession.note("Cleaning up replaced resource...");
+              }
               if (
                 node.old.status === "replacing" ||
                 node.old.status === "replaced"
@@ -1613,7 +1628,11 @@ const collectGarbage = Effect.fnUntraced(function* (
                   removalPolicy: node.removalPolicy,
                 });
               }
-              yield* scopedSession.note("Replaced resource cleanup complete.");
+              yield* scopedSession.note(
+                retainOldGeneration
+                  ? "Replaced resource retained."
+                  : "Replaced resource cleanup complete.",
+              );
             }
           }),
         ));

package/src/Auth/AuthProvider.ts

@@ -33,7 +33,7 @@ export class AuthError extends Schema.TaggedErrorClass<AuthError>()(
   "AuthError",
   {
     message: Schema.String,
-    cause: Schema.optional(Schema.Defect),
+    cause: Schema.optional(Schema.Defect()),
   },
 ) {}
 

package/src/Auth/Profile.ts

@@ -32,12 +32,12 @@ export class AlchemyConfig extends Context.Service<
   {
     version: typeof CONFIG_VERSION;
     profiles: {
-      [profileName: string]: AlchemyProfile;
+      [profileName: string]: AlchemyProfileProviders;
     };
   }
 >()("Alchemy::Profiles") {}
 
-export interface AlchemyProfile {
+export interface AlchemyProfileProviders {
   [providerName: string]: {
     /**
      * The method used to login to the provider. Different providers may use different methods, but common ones are:
@@ -64,7 +64,7 @@ const emptyConfig = (): AlchemyConfig["Service"] => ({
  * {@link ProfileLive} when the layer is built, freeing call sites from
  * having to thread `FileSystem` through their own Effects.
  *
- * Use {@link Profile} directly when you need profile helpers — yield it
+ * Use {@link AlchemyProfile} directly when you need profile helpers — yield it
  * from your `Effect.gen` and call its methods (each has `R = never`).
  */
 export interface ProfileService {
@@ -74,10 +74,10 @@ export interface ProfileService {
   ) => Effect.Effect<void, PlatformError>;
   readonly getProfile: (
     name: string,
-  ) => Effect.Effect<AlchemyProfile | undefined>;
+  ) => Effect.Effect<AlchemyProfileProviders | undefined>;
   readonly setProfile: (
     name: string,
-    profile: AlchemyProfile,
+    profile: AlchemyProfileProviders,
   ) => Effect.Effect<void, PlatformError>;
   readonly deleteProfile: (
     name: string,
@@ -89,19 +89,20 @@ export interface ProfileService {
   ) => Effect.Effect<Config, AuthError | PlatformError>;
 }
 
-export class Profile extends Context.Service<Profile, ProfileService>()(
-  "Alchemy::Profile",
-) {}
+export class AlchemyProfile extends Context.Service<
+  AlchemyProfile,
+  ProfileService
+>()("Alchemy::Profile") {}
 
 /**
- * Layer that builds the {@link Profile} service. Captures the
+ * Layer that builds the {@link AlchemyProfile} service. Captures the
  * {@link FileSystem.FileSystem} dependency at layer-build time, so any
- * Effect that yields {@link Profile} ends up with `R = Profile` (no
+ * Effect that yields {@link AlchemyProfile} ends up with `R = Profile` (no
  * `FileSystem` leak). Provide this once at the top of your runtime
  * (alongside `PlatformServices` / `NodeContext`).
  */
 export const ProfileLive = Layer.effect(
-  Profile,
+  AlchemyProfile,
   Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
 
@@ -136,7 +137,7 @@ export const ProfileLive = Layer.effect(
     const getProfile = (name: string) =>
       readConfig.pipe(Effect.map((config) => config.profiles[name]));
 
-    const setProfile = (name: string, profile: AlchemyProfile) =>
+    const setProfile = (name: string, profile: AlchemyProfileProviders) =>
       readConfig.pipe(
         Effect.tap((config) =>
           Effect.sync(() => (config.profiles[name] = profile)),