alchemy 2.0.0-beta.test-export-fix-4 → 2.0.0-cli-bundle-fix.1

package/src/AWS/Bootstrap.ts

@@ -4,6 +4,7 @@ import * as s3 from "@distilled.cloud/aws/s3";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as Schedule from "effect/Schedule";
+import { AWSEnvironment } from "./Environment.ts";
 
 /**
  * Tag key used to identify the alchemy assets bucket.
@@ -15,8 +16,16 @@ export const ASSETS_BUCKET_TAG = "alchemy::assets-bucket";
  */
 export const ASSETS_BUCKET_REGION_TAG = "alchemy::assets-bucket-region";
 
-const createAssetsBucketName = (region: string) =>
-  `alchemy-assets-${region}-${crypto.randomUUID().replaceAll("-", "").slice(0, 16)}`.toLowerCase();
+/**
+ * Build an account-regional namespace bucket name.
+ *
+ * Account-regional buckets must follow the naming convention:
+ *   `<prefix>-<accountId>-<region>-an`
+ *
+ * @see https://docs.aws.amazon.com/AmazonS3/latest/userguide/gpbucketnamespaces.html#account-regional-gp-buckets
+ */
+const createAssetsBucketName = (accountId: string, region: string) =>
+  `alchemy-assets-${accountId}-${region}-an`.toLowerCase();
 
 const createAssetsBucketTags = (region: string) => [
   { Key: ASSETS_BUCKET_TAG, Value: "true" },
@@ -208,39 +217,28 @@ export const bootstrap = Effect.fn(function* () {
     return { bucketName: existingBucket.value, created: false };
   }
 
-  const bucketName = createAssetsBucketName(region);
-  // Create the bucket
-  if (region === "us-east-1") {
-    yield* s3
-      .createBucket({
-        Bucket: bucketName,
-      })
-      .pipe(
-        Effect.retry({
-          while: (e) =>
-            e._tag === "OperationAborted" || e._tag === "ServiceUnavailable",
-          schedule: Schedule.exponential(100),
-        }),
-      );
-  } else {
-    yield* s3
-      .createBucket({
-        Bucket: bucketName,
-        CreateBucketConfiguration: {
-          LocationConstraint: region as BucketLocationConstraint,
-        },
-      })
-      .pipe(
-        Effect.catchTag("BucketAlreadyOwnedByYou", () => Effect.void),
-        Effect.retry({
-          while: (e) =>
-            e._tag === "OperationAborted" || e._tag === "ServiceUnavailable",
-          schedule: Schedule.exponential(100),
-        }),
-      );
-  }
+  const { accountId } = yield* AWSEnvironment;
+  const bucketName = createAssetsBucketName(accountId, region);
+  yield* s3
+    .createBucket({
+      Bucket: bucketName,
+      BucketNamespace: "account-regional",
+      CreateBucketConfiguration: {
+        Tags: createAssetsBucketTags(region),
+        ...(region === "us-east-1"
+          ? {}
+          : { LocationConstraint: region as BucketLocationConstraint }),
+      },
+    })
+    .pipe(
+      Effect.catchTag("BucketAlreadyOwnedByYou", () => Effect.void),
+      Effect.retry({
+        while: (e) =>
+          e._tag === "OperationAborted" || e._tag === "ServiceUnavailable",
+        schedule: Schedule.exponential(100),
+      }),
+    );
 
-  // Wait for bucket to exist (eventual consistency)
   yield* s3.headBucket({ Bucket: bucketName }).pipe(
     Effect.retry({
       schedule: Schedule.exponential(100).pipe(
@@ -249,9 +247,6 @@ export const bootstrap = Effect.fn(function* () {
     }),
   );
 
-  // Tag the bucket
-  yield* ensureAssetsBucketTags(bucketName, region);
-
   yield* Effect.logInfo(`Created assets bucket: ${bucketName}`);
 
   return { bucketName, created: true };

package/src/AWS/CloudWatch/Alarm.ts

@@ -5,7 +5,7 @@ import { isResolved } from "../../Diff.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
-import { Account, type AccountID } from "../Account.ts";
+import { AWSEnvironment, type AccountID } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import {
   createName,
@@ -73,7 +73,7 @@ export const AlarmProvider = () =>
     Alarm,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createAlarmName = (id: string, props: { name?: string } = {}) =>
         createName(id, props.name, 255);

package/src/AWS/CloudWatch/AlarmMuteRule.ts

@@ -5,7 +5,7 @@ import { isResolved } from "../../Diff.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
-import { Account, type AccountID } from "../Account.ts";
+import { AWSEnvironment, type AccountID } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import { createManagedTags, createName, retryConcurrent } from "./common.ts";
 
@@ -67,7 +67,7 @@ export const AlarmMuteRuleProvider = () =>
     AlarmMuteRule,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createMuteRuleName = (id: string, props: { name?: string } = {}) =>
         createName(id, props.name, 255);

package/src/AWS/CloudWatch/CompositeAlarm.ts

@@ -5,7 +5,7 @@ import { isResolved } from "../../Diff.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
-import { Account } from "../Account.ts";
+import { AWSEnvironment } from "../Environment.ts";
 import type { AlarmArn } from "./Alarm.ts";
 import {
   createName,
@@ -66,7 +66,7 @@ export const CompositeAlarmProvider = () =>
     CompositeAlarm,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createAlarmName = (id: string, props: { name?: string } = {}) =>
         createName(id, props.name, 255);

package/src/AWS/CloudWatch/Dashboard.ts

@@ -4,7 +4,7 @@ import { isResolved } from "../../Diff.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
-import { Account, type AccountID } from "../Account.ts";
+import { AWSEnvironment, type AccountID } from "../Environment.ts";
 import { createName, retryConcurrent } from "./common.ts";
 
 export type DashboardName = string;
@@ -163,7 +163,7 @@ export const DashboardProvider = () =>
   Provider.effect(
     Dashboard,
     Effect.gen(function* () {
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createDashboardName = (id: string, props: { name?: string } = {}) =>
         createName(id, props.name, 255);

package/src/AWS/CloudWatch/InsightRule.ts

@@ -8,7 +8,7 @@ import type { Input } from "../../Input.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
-import { Account, type AccountID } from "../Account.ts";
+import { AWSEnvironment, type AccountID } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import {
   createName,
@@ -121,7 +121,7 @@ export const InsightRuleProvider = () =>
     InsightRule,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createRuleName = (id: string, props: { name?: string } = {}) =>
         createName(id, props.name, 255);

package/src/AWS/CloudWatch/MetricStream.ts

@@ -6,7 +6,7 @@ import type { Input } from "../../Input.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
-import { Account, type AccountID } from "../Account.ts";
+import { AWSEnvironment, type AccountID } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import {
   createName,
@@ -75,7 +75,7 @@ export const MetricStreamProvider = () =>
     MetricStream,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
       const createMetricStreamName = (
         id: string,
         props: { name?: string } = {},

package/src/AWS/Credentials.ts

@@ -1,51 +1,16 @@
-import * as Auth from "@distilled.cloud/aws/Auth";
-import {
-  Credentials,
-  fromAwsCredentialIdentity,
-} from "@distilled.cloud/aws/Credentials";
+import { Credentials } from "@distilled.cloud/aws/Credentials";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
-import { Profile } from "./Profile.ts";
-import { StageConfig } from "./StageConfig.ts";
+import { AWSEnvironment } from "./Environment.ts";
 
 export { Credentials } from "@distilled.cloud/aws/Credentials";
 
 /**
- * Create a lazy credentials layer from stage config.
- * Credentials are resolved on first access, not during layer construction.
+ * Lazy `Credentials` layer derived from the surrounding {@link AWSEnvironment}.
+ * Credentials are resolved on first access (not during layer construction),
+ * matching the existing @distilled.cloud/aws semantics.
  */
-export const fromStageConfig = () =>
-  Layer.effect(
-    Credentials,
-    Effect.gen(function* () {
-      const config = yield* StageConfig;
-      const auth = yield* Auth.Default;
-      if (config.profile) {
-        // Return the lazy Effect - it will be resolved when credentials are actually needed
-        return auth.loadProfileCredentials(config.profile);
-      } else if (config.credentials) {
-        // Static credentials - wrap in Effect.succeed
-        return Effect.succeed(fromAwsCredentialIdentity(config.credentials));
-      }
-      return yield* Effect.die("No AWS credentials found in stage config");
-    }),
-  );
-
-/**
- * Create a lazy SSO credentials layer.
- * Credentials are resolved on first access, not during layer construction.
- */
-export const fromSSO = () =>
-  Layer.effect(
-    Credentials,
-    Effect.gen(function* () {
-      const auth = yield* Auth.Auth;
-      const profileName = Option.getOrElse(
-        yield* Effect.serviceOption(Profile),
-        () => "default",
-      );
-      // Return the lazy Effect - it will be resolved when credentials are actually needed
-      return auth.loadProfileCredentials(profileName);
-    }),
-  );
+export const fromEnvironment = Layer.effect(
+  Credentials,
+  Effect.map(AWSEnvironment.asEffect(), (env) => env.credentials),
+);

package/src/AWS/DynamoDB/Table.ts

@@ -21,7 +21,7 @@ import {
   diffTags,
   hasTags,
 } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 
 export type TableName = string;

package/src/AWS/EC2/EIP.ts

@@ -7,8 +7,8 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags, createTagsList, diffTags } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
-import { Account } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
+import { AWSEnvironment } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 
 export type EIPArn =
@@ -110,7 +110,7 @@ export const EIPProvider = () =>
     EIP,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createTags = Effect.fn(function* (
         id: string,

package/src/AWS/EC2/EgressOnlyInternetGateway.ts

@@ -7,8 +7,8 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags, createTagsList, diffTags } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
-import { Account } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
+import { AWSEnvironment } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import type { VpcId } from "./Vpc.ts";
 
@@ -75,7 +75,7 @@ export const EgressOnlyInternetGatewayProvider = () =>
     EgressOnlyInternetGateway,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createTags = Effect.fn(function* (
         id: string,

package/src/AWS/EC2/Instance.ts

@@ -24,8 +24,8 @@ import {
   createInternalTags,
   diffTags,
 } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
-import { Account } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
+import { AWSEnvironment } from "../Environment.ts";
 import { Assets } from "../Assets.ts";
 import type { PolicyStatement } from "../IAM/Policy.ts";
 import type { RegionID } from "../Region.ts";
@@ -316,7 +316,7 @@ export const InstanceProvider = () =>
     Instance,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
       const stack = yield* Stack;
       const stage = yield* Stage;
       const fs = yield* FileSystem.FileSystem;

package/src/AWS/EC2/InternetGateway.ts

@@ -7,8 +7,8 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags, createTagsList } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
-import { Account } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
+import { AWSEnvironment } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import type { VpcId } from "./Vpc.ts";
 
@@ -72,7 +72,7 @@ export const InternetGatewayProvider = () =>
     InternetGateway,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       return {
         stables: ["internetGatewayId", "internetGatewayArn", "ownerId"],

package/src/AWS/EC2/NatGateway.ts

@@ -15,8 +15,8 @@ import {
   createTagsList,
   diffTags,
 } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
-import { Account } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
+import { AWSEnvironment } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import type { AllocationId } from "./EIP.ts";
 import type { SubnetId } from "./Subnet.ts";
@@ -166,7 +166,7 @@ export const NatGatewayProvider = () =>
     NatGateway,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createTags = Effect.fn(function* (
         id: string,

package/src/AWS/EC2/NetworkAcl.ts

@@ -8,8 +8,8 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags, createTagsList, diffTags } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
-import { Account } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
+import { AWSEnvironment } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import type { VpcId } from "./Vpc.ts";
 
@@ -74,7 +74,7 @@ export const NetworkAclProvider = () =>
     NetworkAcl,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createTags = Effect.fn(function* (
         id: string,

package/src/AWS/EC2/RouteTable.ts

@@ -10,8 +10,8 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags, createTagsList } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
-import { Account } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
+import { AWSEnvironment } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import type { VpcId } from "./Vpc.ts";
 
@@ -178,7 +178,7 @@ export const RouteTableProvider = () =>
     RouteTable,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       return {
         stables: ["routeTableId", "ownerId", "routeTableArn", "vpcId"],

package/src/AWS/EC2/SecurityGroup.ts

@@ -8,8 +8,8 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags, createTagsList, diffTags } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
-import { Account } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
+import { AWSEnvironment } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import type { VpcId } from "./Vpc.ts";
 
@@ -181,7 +181,7 @@ export const SecurityGroupProvider = () =>
     SecurityGroup,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createTags = Effect.fn(function* (
         id: string,

package/src/AWS/EC2/Subnet.ts

@@ -9,7 +9,7 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags, createTagsList, diffTags } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import type { VpcId } from "./Vpc.ts";
 

package/src/AWS/EC2/Vpc.ts

@@ -10,8 +10,8 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags, createTagsList, diffTags } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
-import { Account } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
+import { AWSEnvironment } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 
 export type VpcId = `vpc-${string}`;
@@ -170,7 +170,7 @@ export const VpcProvider = () =>
     Vpc,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createTags = Effect.fn(function* (
         id: string,

package/src/AWS/EC2/VpcEndpoint.ts

@@ -9,10 +9,10 @@ import type { ScopedPlanStatusSession } from "../../Cli/Cli.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, createTagsList, diffTags } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
-import { Account } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
+import { AWSEnvironment } from "../Environment.ts";
+import type { Providers } from "../Providers.ts";
 import type { RegionID } from "../Region.ts";
 import type { RouteTableId } from "./RouteTable.ts";
 import type { SecurityGroupId } from "./SecurityGroup.ts";
@@ -220,7 +220,7 @@ export const VpcEndpointProvider = () =>
     VpcEndpoint,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const createTags = Effect.fn(function* (
         id: string,
@@ -595,11 +595,11 @@ const waitForVpcEndpointAvailable = (
       return yield* new VpcEndpointNotFound({ vpcEndpointId });
     }
 
-    if (ep.State === "Available") {
+    if (ep.State === "available") {
       return ep;
     }
 
-    if (ep.State === "Failed" || ep.State === "Rejected") {
+    if (ep.State === "failed" || ep.State === "rejected") {
       return yield* new VpcEndpointFailed({
         vpcEndpointId,
         errorCode: ep.LastError?.Code,
@@ -641,7 +641,7 @@ const waitForVpcEndpointDeleted = (
 
     const ep = result.VpcEndpoints?.[0];
 
-    if (!ep || ep.State === "Deleted") {
+    if (!ep || ep.State === "deleted") {
       return; // Successfully deleted
     }
 

package/src/AWS/ECR/Repository.ts

@@ -6,7 +6,7 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags, hasAlchemyTags } from "../../Tags.ts";
-import { type AccountID } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 
 export type RepositoryName = string;

package/src/AWS/ECS/Cluster.ts

@@ -7,7 +7,7 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags } from "../../Tags.ts";
-import { Account, type AccountID } from "../Account.ts";
+import { AWSEnvironment, type AccountID } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 
 export type ClusterName = string;
@@ -79,7 +79,7 @@ export const ClusterProvider = () =>
     Cluster,
     Effect.gen(function* () {
       const region = yield* Region;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
 
       const toEcsTags = (tags: Record<string, string>): ecs.Tag[] =>
         Object.entries(tags).map(([key, value]) => ({

package/src/AWS/ECS/Service.ts

@@ -8,7 +8,7 @@ import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import type { ClusterArn } from "./Cluster.ts";
 

package/src/AWS/ECS/Task.ts

@@ -8,6 +8,7 @@ import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import type * as rolldown from "rolldown";
+import { AlchemyContext } from "../../AlchemyContext.ts";
 import * as Bundle from "../../Bundle/Bundle.ts";
 import {
   dockerBuild,
@@ -19,20 +20,19 @@ import {
   findCwdForBundle,
   getStableContextDir,
 } from "../../Bundle/TempRoot.ts";
-import { DotAlchemy } from "../../Config.ts";
 import { isResolved } from "../../Diff.ts";
 import * as Output from "../../Output.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import { Platform, type Main, type PlatformProps } from "../../Platform.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource, type ResourceBinding } from "../../Resource.ts";
-import type { Providers } from "../Providers.ts";
 import type { ProcessContext, ServerHost } from "../../Server/Process.ts";
 import { Stack } from "../../Stack.ts";
 import { createInternalTags, createTagsList, hasTags } from "../../Tags.ts";
-import { Account } from "../Account.ts";
 import type { Credentials } from "../Credentials.ts";
+import { AWSEnvironment } from "../Environment.ts";
 import type { PolicyStatement } from "../IAM/Policy.ts";
+import type { Providers } from "../Providers.ts";
 
 export const isTask = (value: any): value is Task => {
   return (
@@ -223,9 +223,9 @@ export const TaskProvider = () =>
     Task,
     Effect.gen(function* () {
       const stack = yield* Stack;
-      const accountId = yield* Account;
+      const { accountId } = yield* AWSEnvironment;
       const region = yield* Region;
-      const dotAlchemy = yield* DotAlchemy;
+      const { dotAlchemy } = yield* AlchemyContext;
       const fs = yield* FileSystem.FileSystem;
       const virtualEntryPlugin = yield* Bundle.virtualEntryPlugin;
 

package/src/AWS/EKS/Cluster.ts

@@ -18,7 +18,7 @@ import * as Provider from "../../Provider.ts";
 import { Resource, type ResourceBinding } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags, hasAlchemyTags } from "../../Tags.ts";
-import type { AccountID } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 
 export type ClusterName = string;

package/src/AWS/ELBv2/Listener.ts

@@ -5,7 +5,7 @@ import type { Input } from "../../Input.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import type { Providers } from "../Providers.ts";
-import type { AccountID } from "../Account.ts";
+import type { AccountID } from "../Environment.ts";
 import type { RegionID } from "../Region.ts";
 import type { LoadBalancer, LoadBalancerArn } from "./LoadBalancer.ts";
 import type { TargetGroup, TargetGroupArn } from "./TargetGroup.ts";

package/src/AWS/ELBv2/LoadBalancer.ts

@@ -7,7 +7,7 @@ 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 "../Account.ts";
+import type { AccountID } from "../Environment.ts";
 import type { SecurityGroupId } from "../EC2/SecurityGroup.ts";
 import type { SubnetId } from "../EC2/Subnet.ts";
 import type { RegionID } from "../Region.ts";