alchemy 2.0.0-beta.57 → 2.0.0-beta.59

package/src/Cloudflare/Providers.ts

@@ -7,41 +7,34 @@ import * as Ref from "effect/Ref";
 import * as Schedule from "effect/Schedule";
 import { CredentialsStoreLive } from "../Auth/Credentials.ts";
 import { ProfileLive } from "../Auth/Profile.ts";
-import { Command } from "../Build/Command.ts";
-import { DevServer, DevServerProvider } from "../Build/DevServer.ts";
-import * as Build from "../Build/index.ts";
+import * as Command from "../Command/index.ts";
 import { KeyPair, KeyPairProvider } from "../KeyPair.ts";
 import * as Provider from "../Provider.ts";
 import { Random, RandomProvider } from "../Random.ts";
 import * as Access from "./Access.ts";
 import * as AccessApp from "./Access/Application.ts";
-import * as AccessBookmark from "./Access/Bookmark.ts";
+import * as Bookmark from "./Access/Bookmark.ts";
 import * as AccessCert from "./Access/Certificate.ts";
-import * as AccessCustomPage from "./Access/CustomPage.ts";
-import * as AccessGroup from "./Access/Group.ts";
+import * as CustomPage from "./Access/CustomPage.ts";
+import * as Group from "./Access/Group.ts";
 import * as AccessIdp from "./Access/IdentityProvider.ts";
 import * as AccessInfraTarget from "./Access/InfrastructureTarget.ts";
 import * as AccessKeyConfig from "./Access/KeyConfiguration.ts";
-import * as AccessMcpPortal from "./Access/McpPortal.ts";
+import * as McpPortal from "./Access/McpPortal.ts";
 import * as AccessOrg from "./Access/Organization.ts";
 import * as AccessPol from "./Access/Policy.ts";
 import * as AccessSvcToken from "./Access/ServiceToken.ts";
-import * as AccessTag from "./Access/Tag.ts";
+import * as Tag from "./Access/Tag.ts";
 import * as Account from "./Account/index.ts";
 import * as Acm from "./Acm/index.ts";
 import * as Addressing from "./Addressing/index.ts";
-import * as AiGateway from "./AiGateway/index.ts";
-import * as AiSearch from "./AiSearch/index.ts";
-import * as AiSecurity from "./AiSecurity/index.ts";
+import * as AI from "./AI/index.ts";
 import * as Alerting from "./Alerting/index.ts";
-import * as AnalyticsEngine from "./AnalyticsEngine/index.ts";
 import * as ApiShield from "./ApiShield/index.ts";
 import * as ApiToken from "./ApiToken/index.ts";
 import * as Argo from "./Argo/index.ts";
-import * as Artifacts from "./Artifacts/index.ts";
 import { CloudflareAuth } from "./Auth/AuthProvider.ts";
 import * as BotManagement from "./BotManagement/index.ts";
-import * as Browser from "./Browser/index.ts";
 import * as Cache from "./Cache/index.ts";
 import * as Calls from "./Calls/index.ts";
 import * as CertificateAuthorities from "./CertificateAuthorities/index.ts";
@@ -50,7 +43,7 @@ import * as CloudConnector from "./CloudConnector/index.ts";
 import * as CloudflareEnvironment from "./CloudflareEnvironment.ts";
 import * as CloudforceOne from "./CloudforceOne/index.ts";
 import * as Connectivity from "./Connectivity/index.ts";
-import * as Containers from "./Container/index.ts";
+import * as Containers from "./Containers/index.ts";
 import * as ContentScanning from "./ContentScanning/index.ts";
 import * as Credentials from "./Credentials.ts";
 import * as CustomCertificates from "./CustomCertificate/index.ts";
@@ -61,20 +54,18 @@ import * as DdosProtection from "./DdosProtection/index.ts";
 import * as Devices from "./Devices/index.ts";
 import * as Diagnostics from "./Diagnostics/index.ts";
 import * as Dlp from "./Dlp/index.ts";
-import * as Dns from "./Dns/index.ts";
-import * as DnsFirewall from "./DnsFirewall/index.ts";
+import * as Dns from "./DNS/index.ts";
 import * as Email from "./Email/index.ts";
-import * as EmailSecurity from "./EmailSecurity/index.ts";
 import * as Firewall from "./Firewall/index.ts";
 import * as Flagship from "./Flagship/index.ts";
 import * as Fraud from "./Fraud/index.ts";
-import * as GatewayCertificate from "./Gateway/Certificate.ts";
-import * as GatewayConfiguration from "./Gateway/Configuration.ts";
-import * as GatewayList from "./Gateway/List.ts";
-import * as GatewayLocation from "./Gateway/Location.ts";
-import * as GatewayLogging from "./Gateway/Logging.ts";
-import * as GatewayProxyEndpoint from "./Gateway/ProxyEndpoint.ts";
-import * as GatewayRule from "./Gateway/Rule.ts";
+import * as Certificate from "./Gateway/Certificate.ts";
+import * as Configuration from "./Gateway/Configuration.ts";
+import * as List from "./Gateway/List.ts";
+import * as Location from "./Gateway/Location.ts";
+import * as Logging from "./Gateway/Logging.ts";
+import * as ProxyEndpoint from "./Gateway/ProxyEndpoint.ts";
+import * as Rule from "./Gateway/Rule.ts";
 import * as GoogleTagGateway from "./GoogleTagGateway/index.ts";
 import * as Healthcheck from "./Healthcheck/index.ts";
 import * as HostnameTlsSetting from "./HostnameTlsSetting/index.ts";
@@ -103,10 +94,8 @@ import * as PageRule from "./PageRule/index.ts";
 import * as Pages from "./Pages/index.ts";
 import * as PageShield from "./PageShield/index.ts";
 import * as Pipelines from "./Pipelines/index.ts";
-import * as Queue from "./Queue/index.ts";
+import * as Queue from "./Queues/index.ts";
 import * as R2 from "./R2/index.ts";
-import * as R2DataCatalog from "./R2DataCatalog/index.ts";
-import * as RateLimit from "./RateLimit/index.ts";
 import * as RealtimeKit from "./RealtimeKit/index.ts";
 import * as RegionalHostname from "./RegionalHostname/index.ts";
 import * as Registrar from "./Registrar/index.ts";
@@ -134,8 +123,8 @@ import * as VulnScanner from "./VulnerabilityScanner/index.ts";
 import * as WaitingRoom from "./WaitingRoom/index.ts";
 import * as Web3 from "./Web3/index.ts";
 import * as Workers from "./Workers/index.ts";
-import * as Workflows from "./Workers/Workflow.ts";
 import * as WorkersForPlatforms from "./WorkersForPlatforms/index.ts";
+import * as Workflows from "./Workflows/Workflow.ts";
 import * as Zaraz from "./Zaraz/index.ts";
 import * as Zone from "./Zone/index.ts";
 
@@ -154,79 +143,69 @@ export const providers = () =>
   Layer.effect(
     Providers,
     Provider.collection([
-      AccessApp.AccessApplication,
-      AccessBookmark.AccessBookmark,
-      AccessCert.AccessCertificate,
-      AccessCustomPage.AccessCustomPage,
-      AccessGroup.AccessGroup,
-      AccessIdp.AccessIdentityProvider,
-      AccessInfraTarget.AccessInfrastructureTarget,
-      AccessKeyConfig.AccessKeyConfiguration,
-      AccessMcpPortal.AccessMcpPortal,
-      AccessOrg.AccessOrganization,
-      AccessPol.AccessPolicy,
-      AccessSvcToken.AccessServiceToken,
-      AccessTag.AccessTag,
+      AccessApp.Application,
+      AccessCert.Certificate,
+      AccessIdp.IdentityProvider,
+      AccessInfraTarget.InfrastructureTarget,
+      AccessKeyConfig.KeyConfiguration,
+      AccessOrg.Organization,
+      AccessPol.Policy,
+      AccessSvcToken.ServiceToken,
       Account.Account,
-      Account.AccountMember,
+      Account.Member,
       Acm.CustomTrustStore,
       Acm.TotalTls,
-      Addressing.AddressingBgpPrefix,
-      Addressing.AddressingPrefix,
-      Addressing.AddressingPrefixDelegation,
-      Addressing.AddressingServiceBinding,
       Addressing.AddressMap,
-      AiGateway.AiGateway,
-      AiGateway.AiGatewayBindingPolicy,
-      AiGateway.AiGatewayDataset,
-      AiGateway.AiGatewayDynamicRouting,
-      AiGateway.AiGatewayEvaluation,
-      AiGateway.AiGatewayProviderConfig,
-      AiGateway.AiGatewaySpendingLimit,
-      AiSearch.AiSearchInstance,
-      AiSearch.AiSearchInstanceBindingPolicy,
-      AiSearch.AiSearchNamespace,
-      AiSearch.AiSearchNamespaceBindingPolicy,
-      AiSearch.AiSearchToken,
-      AiSecurity.AiSecurityCustomTopics,
-      AiSecurity.AiSecuritySettings,
+      Addressing.BgpPrefix,
+      Addressing.Prefix,
+      Addressing.PrefixDelegation,
+      Addressing.ServiceBinding,
+      AI.CustomTopics,
+      AI.Dataset,
+      AI.Evaluation,
+      AI.Gateway,
+      AI.GatewayDynamicRouting,
+      AI.GatewayProvider,
+      AI.SearchInstance,
+      AI.SearchNamespace,
+      AI.SearchToken,
+      AI.SecuritySettings,
       Alerting.NotificationPolicy,
       Alerting.NotificationWebhook,
       Alerting.Silence,
-      AnalyticsEngine.AnalyticsEngineDatasetBindingPolicy,
-      ApiShield.ApiShieldConfiguration,
-      ApiShield.ApiShieldLabel,
-      ApiShield.ApiShieldOperation,
-      ApiShield.ApiShieldUserSchema,
+      ApiShield.Configuration,
+      ApiShield.Label,
+      ApiShield.Operation,
+      ApiShield.UserSchema,
       ApiToken.AccountApiToken,
       ApiToken.UserApiToken,
       Argo.SmartRouting,
       Argo.TieredCaching,
-      Artifacts.ArtifactsBindingPolicy,
+      Bookmark.Bookmark,
       BotManagement.BotManagement,
-      Browser.BrowserBindingPolicy,
-      Cache.CacheReserve,
       Cache.OriginCloudRegion,
       Cache.RegionalTieredCache,
+      Cache.Reserve,
       Cache.SmartTieredCache,
       Cache.Variants,
-      Calls.CallsApp,
-      Calls.CallsTurnKey,
+      Calls.App,
+      Calls.TurnKey,
+      Certificate.Certificate,
       CertificateAuthorities.HostnameAssociation,
       ClientCertificate.ClientCertificate,
-      CloudConnector.CloudConnectorRules,
-      CloudforceOne.CloudforceOneScanConfig,
-      Command,
+      CloudConnector.Rules,
+      CloudforceOne.ScanConfig,
+      Configuration.Configuration,
       Connectivity.DirectoryService,
-      Containers.Container,
+      Containers.ContainerPlatform,
       ContentScanning.ContentScanning,
-      ContentScanning.ContentScanningExpression,
+      ContentScanning.Expression,
       CustomCertificates.CustomCertificate,
       CustomHostnames.CustomHostname,
       CustomHostnames.FallbackOrigin,
       CustomNameservers.CustomNameserver,
-      D1.D1ConnectionPolicy,
-      D1.D1Database,
+      CustomPage.CustomPage,
+      D1.Database,
       DdosProtection.DdosAllowlistEntry,
       DdosProtection.SynProtectionFilter,
       DdosProtection.SynProtectionRule,
@@ -239,80 +218,68 @@ export const providers = () =>
       Devices.DevicePostureIntegration,
       Devices.DevicePostureRule,
       Devices.DeviceSettings,
-      DevServer,
       Diagnostics.EndpointHealthcheck,
-      Dlp.DlpEntry,
-      Dlp.DlpProfile,
+      Dlp.Entry,
+      Dlp.Profile,
       Dns.AccountDnsSettings,
-      Dns.DnsReadPolicy,
-      Dns.DnsReadWritePolicy,
-      Dns.DnsRecord,
       Dns.Dnssec,
-      Dns.DnsView,
-      Dns.DnsWritePolicy,
+      Dns.Firewall,
+      Dns.Record,
+      Dns.View,
       Dns.ZoneDnsSettings,
       Dns.ZoneTransferAcl,
       Dns.ZoneTransferIncoming,
       Dns.ZoneTransferOutgoing,
       Dns.ZoneTransferPeer,
       Dns.ZoneTransferTsig,
-      DnsFirewall.DnsFirewall,
-      Email.EmailAddress,
-      Email.EmailCatchAll,
-      Email.EmailRouting,
-      Email.EmailRule,
-      Email.EmailSendingSubdomain,
-      Email.SendEmailBindingPolicy,
-      EmailSecurity.EmailSecurityAllowPolicy,
-      EmailSecurity.EmailSecurityBlockSender,
-      EmailSecurity.EmailSecurityDomain,
-      EmailSecurity.EmailSecurityImpersonationRegistryEntry,
-      EmailSecurity.EmailSecurityTrustedDomain,
-      Firewall.FirewallAccessRule,
+      Email.Address,
+      Email.AllowPolicy,
+      Email.BlockSender,
+      Email.CatchAll,
+      Email.Domain,
+      Email.ImpersonationRegistryEntry,
+      Email.Routing,
+      Email.Rule,
+      Email.SendingSubdomain,
+      Email.TrustedDomain,
+      Firewall.AccessRule,
       Firewall.Lockdown,
       Firewall.UaRule,
-      Flagship.FlagshipApp,
-      Flagship.FlagshipBindingPolicy,
-      Flagship.FlagshipFlag,
-      Fraud.FraudDetectionSettings,
-      GatewayCertificate.GatewayCertificate,
-      GatewayConfiguration.GatewayConfiguration,
-      GatewayList.GatewayList,
-      GatewayLocation.GatewayLocation,
-      GatewayLogging.GatewayLogging,
-      GatewayProxyEndpoint.GatewayProxyEndpoint,
-      GatewayRule.GatewayRule,
+      Flagship.App,
+      Flagship.Flag,
+      Fraud.DetectionSettings,
       GoogleTagGateway.GoogleTagGateway,
+      Group.Group,
       Healthcheck.Healthcheck,
       HostnameTlsSetting.HostnameTlsSetting,
-      Hyperdrive.Hyperdrive,
-      Hyperdrive.HyperdriveBindingPolicy,
-      Iam.IamResourceGroup,
-      Iam.IamUserGroup,
-      Iam.IamUserGroupMembership,
-      Images.ImagesBindingPolicy,
-      Images.ImagesSigningKey,
-      Images.ImagesVariant,
+      Hyperdrive.Connection,
+      Iam.ResourceGroup,
+      Iam.UserGroup,
+      Iam.UserGroupMembership,
+      Images.SigningKey,
+      Images.Variant,
       Intel.IndicatorFeed,
       Intel.IndicatorFeedPermission,
       KeylessCertificate.KeylessCertificate,
       KeyPair,
-      KV.KVNamespace,
-      KV.KVNamespaceBindingPolicy,
+      KV.Namespace,
       LeakedCredentialCheck.LeakedCredentialCheck,
       LeakedCredentialCheck.LeakedCredentialDetection,
+      List.List,
       LoadBalancer.LoadBalancer,
-      LoadBalancer.LoadBalancerMonitor,
-      LoadBalancer.LoadBalancerMonitorGroup,
-      LoadBalancer.LoadBalancerPool,
-      Logpush.LogpushJob,
-      LogsControl.LogsCmbConfig,
+      LoadBalancer.Monitor,
+      LoadBalancer.MonitorGroup,
+      LoadBalancer.Pool,
+      Location.Location,
+      Logging.Logging,
+      Logpush.Job,
+      LogsControl.CmbConfig,
       LogsControl.LogsRetentionFlag,
       MagicCloudNetworking.CatalogSync,
       MagicCloudNetworking.CloudIntegration,
       MagicCloudNetworking.OnRamp,
-      MagicNetworkMonitoring.MagicNetworkMonitoringConfig,
-      MagicNetworkMonitoring.MagicNetworkMonitoringRule,
+      MagicNetworkMonitoring.Config,
+      MagicNetworkMonitoring.Rule,
       MagicTransit.GreTunnel,
       MagicTransit.IpsecTunnel,
       MagicTransit.MagicApp,
@@ -322,331 +289,260 @@ export const providers = () =>
       MagicTransit.MagicSiteWan,
       MagicTransit.MagicStaticRoute,
       ManagedTransforms.ManagedTransforms,
+      McpPortal.McpPortal,
       MtlsCertificate.MtlsCertificate,
       NetworkInterconnects.NetworkInterconnectSettings,
       Organization.Organization,
       OriginCaCertificate.OriginCaCertificate,
       OriginPostQuantumEncryption.OriginPostQuantumEncryption,
-      OriginTlsClientAuth.OriginTlsClientAuthCertificate,
-      OriginTlsClientAuth.OriginTlsClientAuthHostnameAssociation,
-      OriginTlsClientAuth.OriginTlsClientAuthHostnameCertificate,
-      OriginTlsClientAuth.OriginTlsClientAuthSetting,
+      OriginTlsClientAuth.Certificate,
+      OriginTlsClientAuth.HostnameAssociation,
+      OriginTlsClientAuth.HostnameCertificate,
+      OriginTlsClientAuth.Setting,
       PageRule.PageRule,
-      Pages.PagesDeployment,
-      Pages.PagesDomain,
-      Pages.PagesProject,
-      PageShield.PageShieldPolicy,
-      PageShield.PageShieldSettings,
+      Pages.Deployment,
+      Pages.Domain,
+      Pages.Project,
+      PageShield.Policy,
+      PageShield.Settings,
       Pipelines.LegacyPipeline,
       Pipelines.Pipeline,
-      Pipelines.PipelineSink,
-      Pipelines.PipelineStream,
+      Pipelines.Sink,
+      Pipelines.Stream,
+      ProxyEndpoint.ProxyEndpoint,
+      Queue.Consumer,
       Queue.Queue,
-      Queue.QueueBindingPolicy,
-      Queue.QueueConsumer,
-      Queue.QueueEventSourcePolicy,
-      Queue.QueueSubscription,
-      R2.R2Bucket,
-      R2.R2BucketBindingPolicy,
-      R2.R2BucketEventNotification,
-      R2.R2BucketSippy,
-      R2DataCatalog.R2DataCatalog,
+      Queue.Subscription,
+      R2.Bucket,
+      R2.BucketEventNotification,
+      R2.BucketSippy,
+      R2.DataCatalog,
       Random,
-      RateLimit.RateLimitBindingPolicy,
-      RealtimeKit.RealtimeKitApp,
-      RealtimeKit.RealtimeKitPreset,
-      RealtimeKit.RealtimeKitWebhook,
+      RealtimeKit.App,
+      RealtimeKit.Preset,
+      RealtimeKit.Webhook,
       RegionalHostname.RegionalHostname,
-      Registrar.RegistrarDomain,
+      Registrar.Domain,
       ResourceSharing.Share,
       ResourceSharing.ShareRecipient,
       ResourceSharing.ShareResource,
-      RiskScoring.RiskScoringIntegration,
-      Rules.RulesList,
+      RiskScoring.Integration,
+      Rule.Rule,
+      Rules.List,
+      Ruleset.AccountEntrypoint,
       Ruleset.CustomRuleset,
       Ruleset.Ruleset,
-      Ruleset.RulesetAccountEntrypoint,
-      Rum.RumRule,
-      Rum.RumSite,
-      SchemaValidation.SchemaValidationOperationSetting,
+      Rum.Rule,
+      Rum.Site,
+      SchemaValidation.OperationSetting,
       SchemaValidation.SchemaValidationSchema,
-      SchemaValidation.SchemaValidationSettings,
+      SchemaValidation.Settings,
       SecretsStore.Secret,
-      SecretsStore.SecretBindingPolicy,
-      SecretsStore.SecretsStore,
+      SecretsStore.Store,
       SecurityTxt.SecurityTxt,
       Snippets.Snippet,
       Snippets.SnippetRules,
-      Spectrum.SpectrumApplication,
-      Speed.SpeedTestSchedule,
+      Spectrum.Application,
+      Speed.TestSchedule,
       Ssl.CertificatePack,
       Ssl.UniversalSsl,
-      Stream.StreamLiveInput,
-      Stream.StreamLiveInputOutput,
-      Stream.StreamSigningKey,
-      Stream.StreamWatermark,
-      Stream.StreamWebhook,
+      Stream.LiveInput,
+      Stream.LiveInputOutput,
+      Stream.SigningKey,
+      Stream.Watermark,
+      Stream.Webhook,
+      Tag.Tag,
       Tags.AccountResourceTags,
       Tags.ZoneResourceTags,
+      TokenValidation.Rule,
       TokenValidation.TokenConfiguration,
-      TokenValidation.TokenValidationRule,
+      Tunnel.Configuration,
+      Tunnel.HostnameRoute,
+      Tunnel.Route,
       Tunnel.Tunnel,
-      Tunnel.TunnelConfiguration,
-      Tunnel.TunnelHostnameRoute,
-      Tunnel.TunnelReadPolicy,
-      Tunnel.TunnelReadWritePolicy,
-      Tunnel.TunnelRoute,
-      Tunnel.TunnelVirtualNetwork,
-      Tunnel.TunnelWarpConnector,
-      Tunnel.TunnelWritePolicy,
-      Turnstile.TurnstileWidget,
+      Tunnel.VirtualNetwork,
+      Tunnel.WarpConnector,
+      Turnstile.Widget,
       UrlNorm.UrlNormalization,
-      Vectorize.VectorizeIndex,
-      Vectorize.VectorizeIndexBindingPolicy,
-      Vectorize.VectorizeMetadataIndex,
+      Vectorize.Index,
+      Vectorize.MetadataIndex,
       VpcService.VpcService,
       VulnScanner.VulnScannerCredential,
       VulnScanner.VulnScannerCredentialSet,
       VulnScanner.VulnScannerTargetEnvironment,
+      WaitingRoom.Settings,
       WaitingRoom.WaitingRoom,
-      WaitingRoom.WaitingRoomSettings,
-      Web3.Web3Hostname,
-      Web3.Web3HostnameContentList,
-      Workers.BindWorkerPolicy,
-      Workers.CronEventSourcePolicy,
-      Workers.FetchPolicy,
-      Workers.GitHubRepositoryEventSourcePolicy,
+      Web3.Hostname,
+      Web3.HostnameContentList,
+      Workers.AccountSetting,
       Workers.ObservabilityDestination,
-      Workers.VersionMetadataBindingPolicy,
+      Workers.Subdomain,
       Workers.Worker,
       Workers.WorkerRoute,
-      Workers.WorkersAccountSetting,
-      Workers.WorkersSubdomain,
       WorkersForPlatforms.DispatchNamespace,
       Workflows.WorkflowResource,
-      Zaraz.ZarazConfig,
+      Zaraz.Config,
+      Zone.CustomNameservers,
+      Zone.Hold,
+      Zone.Setting,
       Zone.Zone,
-      Zone.ZoneCustomNameservers,
-      Zone.ZoneHold,
-      Zone.ZoneSetting,
     ]),
   ).pipe(
     Layer.provide(
       Layer.mergeAll(
-        AccessApp.AccessApplicationProvider(),
-        AccessOrg.AccessOrganizationProvider(),
-        AccessPol.AccessPolicyProvider(),
-        AiGateway.AiGatewayBindingPolicyLive,
-        AiGateway.AiGatewayProvider(),
-        AiGateway.AiGatewaySpendingLimitProvider(),
-        AnalyticsEngine.AnalyticsEngineDatasetBindingPolicyLive,
+        AccessApp.ApplicationProvider(),
+        AccessApp.ApplicationProvider(),
+        AccessCert.CertificateProvider(),
+        AccessIdp.IdentityProviderProvider(),
+        AccessInfraTarget.InfrastructureTargetProvider(),
+        AccessKeyConfig.KeyConfigurationProvider(),
+        AccessOrg.OrganizationProvider(),
+        AccessOrg.OrganizationProvider(),
+        AccessPol.PolicyProvider(),
+        AccessPol.PolicyProvider(),
+        AccessSvcToken.ServiceTokenProvider(),
+        Account.AccountProvider(),
+        Account.MemberProvider(),
+        Acm.CustomTrustStoreProvider(),
+        Acm.TotalTlsProvider(),
+        Addressing.AddressMapProvider(),
+        Addressing.BgpPrefixProvider(),
+        Addressing.PrefixDelegationProvider(),
+        Addressing.PrefixProvider(),
+        Addressing.ServiceBindingProvider(),
+        AI.CustomTopicsProvider(),
+        AI.DatasetProvider(),
+        AI.DynamicRoutingProvider(),
+        AI.EvaluationProvider(),
+        AI.GatewayProviderProvider(),
+        AI.GatewayResourceProvider(),
+        AI.SearchInstanceProvider(),
+        AI.SearchNamespaceProvider(),
+        AI.SearchTokenProvider(),
+        AI.SecuritySettingsProvider(),
+        Alerting.NotificationPolicyProvider(),
+        Alerting.NotificationWebhookProvider(),
+        Alerting.SilenceProvider(),
+        ApiShield.ConfigurationProvider(),
+        ApiShield.LabelProvider(),
+        ApiShield.OperationProvider(),
+        ApiShield.UserSchemaProvider(),
         ApiToken.AccountApiTokenProvider(),
+        ApiToken.AccountApiTokenProvider(),
+        ApiToken.UserApiTokenProvider(),
         ApiToken.UserApiTokenProvider(),
-        Artifacts.ArtifactsBindingPolicyLive,
-        Browser.BrowserBindingPolicyLive,
+        Argo.SmartRoutingProvider(),
+        Argo.TieredCachingProvider(),
+        Bookmark.BookmarkProvider(),
+        BotManagement.BotManagementProvider(),
+        Cache.OriginCloudRegionProvider(),
+        Cache.RegionalTieredCacheProvider(),
+        Cache.ReserveProvider(),
+        Cache.SmartTieredCacheProvider(),
+        Cache.VariantsProvider(),
+        Calls.AppProvider(),
+        Calls.TurnKeyProvider(),
+        Certificate.CertificateProvider(),
+        CertificateAuthorities.HostnameAssociationProvider(),
+        ClientCertificate.ClientCertificateProvider(),
+        CloudConnector.RulesProvider(),
+        CloudforceOne.ScanConfigProvider(),
+        Configuration.ConfigurationProvider(),
+        Connectivity.DirectoryServiceProvider(),
+        Containers.ContainerProvider(),
         Containers.ContainerProvider(),
-        D1.D1ConnectionPolicyLive,
+        ContentScanning.ContentScanningProvider(),
+        ContentScanning.ExpressionProvider(),
+        CustomCertificates.CustomCertificateProvider(),
+        CustomHostnames.CustomHostnameProvider(),
+        CustomHostnames.FallbackOriginProvider(),
+        CustomNameservers.CustomNameserverProvider(),
+        CustomPage.CustomPageProvider(),
         D1.DatabaseProvider(),
+        D1.DatabaseProvider(),
+        DdosProtection.DdosAllowlistEntryProvider(),
+        DdosProtection.SynProtectionFilterProvider(),
+        DdosProtection.SynProtectionRuleProvider(),
+        DdosProtection.TcpFlowProtectionFilterProvider(),
+        DdosProtection.TcpFlowProtectionRuleProvider(),
+        Devices.DeviceCustomProfileProvider(),
+        Devices.DeviceDefaultProfileProvider(),
         Devices.DeviceDefaultProfileProvider(),
-        DevServerProvider(),
-        Dns.DnsReadPolicyLive,
-        Dns.DnsReadWritePolicyLive,
-        Dns.DnsRecordProvider(),
-        Dns.DnsWritePolicyLive,
-        Email.EmailAddressProvider(),
-        Email.EmailRoutingProvider(),
-        Email.EmailRuleProvider(),
-        Email.SendEmailBindingPolicyLive,
-        Flagship.FlagshipBindingPolicyLive,
-        GatewayRule.GatewayRuleProvider(),
-        Hyperdrive.HyperdriveBindingPolicyLive,
-        Hyperdrive.HyperdriveProvider(),
-        Images.ImagesBindingPolicyLive,
-        KV.KVNamespaceBindingPolicyLive,
-        KV.KVNamespaceProvider(),
-        Queue.QueueBindingPolicyLive,
-        Queue.QueueConsumerProvider(),
-        Queue.QueueEventSourcePolicyLive,
-        Queue.QueueProvider(),
-        R2.R2BucketBindingPolicyLive,
-        R2.R2BucketProvider(),
-        RateLimit.RateLimitBindingPolicyLive,
-        Ruleset.RulesetProvider(),
-        SecretsStore.SecretBindingPolicyLive,
-        SecretsStore.SecretsStoreProvider(),
-        SecretsStore.StoreSecretProvider(),
-        Tunnel.TunnelConfigurationProvider(),
-        Tunnel.TunnelProvider(),
-        Tunnel.TunnelReadPolicyLive,
-        Tunnel.TunnelReadWritePolicyLive,
-        Tunnel.TunnelRouteProvider(),
-        Tunnel.TunnelWritePolicyLive,
-        Vectorize.VectorizeIndexBindingPolicyLive,
-        Vectorize.VectorizeIndexProvider(),
-        Vectorize.VectorizeMetadataIndexProvider(),
-        VpcService.VpcServiceProvider(),
-        Workers.BindWorkerPolicyLive,
-        Workers.CronEventSourcePolicyLive,
-        Workers.FetchPolicyLive,
-        Workers.GitHubRepositoryEventSourcePolicyLive,
-        Workers.VersionMetadataBindingPolicyLive,
-        Workers.WorkerProvider(),
-        Workflows.WorkflowProvider(),
-        Zaraz.ZarazConfigProvider(),
-        Zone.ZoneProvider(),
+        Devices.DeviceDexTestProvider(),
+        Devices.DeviceManagedNetworkProvider(),
+        Devices.DevicePostureIntegrationProvider(),
+        Devices.DevicePostureRuleProvider(),
+        Devices.DeviceSettingsProvider(),
+
         // Split into nested groups: a single flat mergeAll with ~200
         // arguments exceeds tsgo's variadic inference ceiling and
         // silently drops the tail layers from the inferred union.
         Layer.mergeAll(
-          AccessApp.AccessApplicationProvider(),
-          AccessBookmark.AccessBookmarkProvider(),
-          AccessCert.AccessCertificateProvider(),
-          AccessCustomPage.AccessCustomPageProvider(),
-          AccessGroup.AccessGroupProvider(),
-          AccessIdp.AccessIdentityProviderProvider(),
-          AccessInfraTarget.AccessInfrastructureTargetProvider(),
-          AccessKeyConfig.AccessKeyConfigurationProvider(),
-          AccessMcpPortal.AccessMcpPortalProvider(),
-          AccessOrg.AccessOrganizationProvider(),
-          AccessPol.AccessPolicyProvider(),
-          AccessSvcToken.AccessServiceTokenProvider(),
-          AccessTag.AccessTagProvider(),
-          Account.AccountMemberProvider(),
-          Account.AccountProvider(),
-          Acm.CustomTrustStoreProvider(),
-          Acm.TotalTlsProvider(),
-          Addressing.AddressingBgpPrefixProvider(),
-          Addressing.AddressingPrefixDelegationProvider(),
-          Addressing.AddressingPrefixProvider(),
-          Addressing.AddressingServiceBindingProvider(),
-          Addressing.AddressMapProvider(),
-          AiGateway.AiGatewayBindingPolicyLive,
-          AiGateway.AiGatewayDatasetProvider(),
-          AiGateway.AiGatewayDynamicRoutingProvider(),
-          AiGateway.AiGatewayEvaluationProvider(),
-          AiGateway.AiGatewayProvider(),
-          AiGateway.AiGatewayProviderConfigProvider(),
-          AiGateway.AiGatewaySpendingLimitProvider(),
-          AiSearch.AiSearchInstanceBindingPolicyLive,
-          AiSearch.AiSearchInstanceProvider(),
-          AiSearch.AiSearchNamespaceBindingPolicyLive,
-          AiSearch.AiSearchNamespaceProvider(),
-          AiSearch.AiSearchTokenProvider(),
-          AiSecurity.AiSecurityCustomTopicsProvider(),
-          AiSecurity.AiSecuritySettingsProvider(),
-          Alerting.NotificationPolicyProvider(),
-          Alerting.NotificationWebhookProvider(),
-          Alerting.SilenceProvider(),
-          AnalyticsEngine.AnalyticsEngineDatasetBindingPolicyLive,
-          ApiShield.ApiShieldConfigurationProvider(),
-          ApiShield.ApiShieldLabelProvider(),
-          ApiShield.ApiShieldOperationProvider(),
-          ApiShield.ApiShieldUserSchemaProvider(),
-          ApiToken.AccountApiTokenProvider(),
-          ApiToken.UserApiTokenProvider(),
-          Argo.SmartRoutingProvider(),
-          Argo.TieredCachingProvider(),
-          Artifacts.ArtifactsBindingPolicyLive,
-          BotManagement.BotManagementProvider(),
-          Browser.BrowserBindingPolicyLive,
-          Cache.CacheReserveProvider(),
-          Cache.OriginCloudRegionProvider(),
-          Cache.RegionalTieredCacheProvider(),
-          Cache.SmartTieredCacheProvider(),
-          Cache.VariantsProvider(),
-          Calls.CallsAppProvider(),
-          Calls.CallsTurnKeyProvider(),
-          CertificateAuthorities.HostnameAssociationProvider(),
-          ClientCertificate.ClientCertificateProvider(),
-          CloudConnector.CloudConnectorRulesProvider(),
-          CloudforceOne.CloudforceOneScanConfigProvider(),
-          Connectivity.DirectoryServiceProvider(),
-          Containers.ContainerProvider(),
-          ContentScanning.ContentScanningExpressionProvider(),
-          ContentScanning.ContentScanningProvider(),
-          CustomCertificates.CustomCertificateProvider(),
-          CustomHostnames.CustomHostnameProvider(),
-          CustomHostnames.FallbackOriginProvider(),
-          CustomNameservers.CustomNameserverProvider(),
-          D1.D1ConnectionPolicyLive,
-          D1.DatabaseProvider(),
-          DdosProtection.DdosAllowlistEntryProvider(),
-          DdosProtection.SynProtectionFilterProvider(),
-          DdosProtection.SynProtectionRuleProvider(),
-          DdosProtection.TcpFlowProtectionFilterProvider(),
-          DdosProtection.TcpFlowProtectionRuleProvider(),
-          Devices.DeviceCustomProfileProvider(),
-          Devices.DeviceDefaultProfileProvider(),
-          Devices.DeviceDexTestProvider(),
-          Devices.DeviceManagedNetworkProvider(),
-          Devices.DevicePostureIntegrationProvider(),
-          Devices.DevicePostureRuleProvider(),
-          Devices.DeviceSettingsProvider(),
-          DevServerProvider(),
           Diagnostics.EndpointHealthcheckProvider(),
-          Dlp.DlpEntryProvider(),
-          Dlp.DlpProfileProvider(),
-          Dns.DnsReadPolicyLive,
-          Dns.DnsReadWritePolicyLive,
-          Dns.DnsRecordProvider(),
+          Dlp.EntryProvider(),
+          Dlp.ProfileProvider(),
+          Dns.AccountDnsSettingsProvider(),
           Dns.DnssecProvider(),
-          Dns.DnsWritePolicyLive,
+          Dns.FirewallProvider(),
+          Dns.RecordProvider(),
+          Dns.RecordProvider(),
+          Dns.ViewProvider(),
           Dns.ZoneDnsSettingsProvider(),
-          DnsFirewall.DnsFirewallProvider(),
-          Email.EmailAddressProvider(),
-          Email.EmailCatchAllProvider(),
-          Email.EmailRoutingProvider(),
-          Email.EmailRuleProvider(),
-          Email.EmailSendingSubdomainProvider(),
-          Email.SendEmailBindingPolicyLive,
-          EmailSecurity.EmailSecurityAllowPolicyProvider(),
-          EmailSecurity.EmailSecurityBlockSenderProvider(),
-          EmailSecurity.EmailSecurityDomainProvider(),
-          EmailSecurity.EmailSecurityImpersonationRegistryEntryProvider(),
-          EmailSecurity.EmailSecurityTrustedDomainProvider(),
-          Firewall.FirewallAccessRuleProvider(),
+          Dns.ZoneTransferAclProvider(),
+          Dns.ZoneTransferIncomingProvider(),
+          Dns.ZoneTransferOutgoingProvider(),
+          Dns.ZoneTransferPeerProvider(),
+          Dns.ZoneTransferTsigProvider(),
+          Email.AddressProvider(),
+          Email.AddressProvider(),
+          Email.AllowPolicyProvider(),
+          Email.BlockSenderProvider(),
+          Email.CatchAllProvider(),
+          Email.DomainProvider(),
+          Email.ImpersonationRegistryEntryProvider(),
+          Email.RoutingProvider(),
+          Email.RoutingProvider(),
+          Email.RuleProvider(),
+          Email.RuleProvider(),
+          Email.SendingSubdomainProvider(),
+          Email.TrustedDomainProvider(),
+          Firewall.AccessRuleProvider(),
           Firewall.LockdownProvider(),
           Firewall.UaRuleProvider(),
-          Flagship.FlagshipAppProvider(),
-          Flagship.FlagshipFlagProvider(),
-          Fraud.FraudDetectionSettingsProvider(),
-          GatewayCertificate.GatewayCertificateProvider(),
-          GatewayConfiguration.GatewayConfigurationProvider(),
-          GatewayList.GatewayListProvider(),
-          GatewayLocation.GatewayLocationProvider(),
-          GatewayLogging.GatewayLoggingProvider(),
-          GatewayProxyEndpoint.GatewayProxyEndpointProvider(),
-          GatewayRule.GatewayRuleProvider(),
+          Flagship.AppProvider(),
+          Flagship.FlagProvider(),
+          Fraud.DetectionSettingsProvider(),
+          GoogleTagGateway.GoogleTagGatewayProvider(),
+          Group.GroupProvider(),
           Healthcheck.HealthcheckProvider(),
           HostnameTlsSetting.HostnameTlsSettingProvider(),
-          Hyperdrive.HyperdriveBindingPolicyLive,
-          Hyperdrive.HyperdriveProvider(),
-          Iam.IamResourceGroupProvider(),
-          Iam.IamUserGroupMembershipProvider(),
-          Iam.IamUserGroupProvider(),
-          Images.ImagesBindingPolicyLive,
-          Images.ImagesSigningKeyProvider(),
-          Images.ImagesVariantProvider(),
+          Hyperdrive.ConnectionProvider(),
+          Hyperdrive.ConnectionProvider(),
+          Iam.ResourceGroupProvider(),
+          Iam.UserGroupMembershipProvider(),
+          Iam.UserGroupProvider(),
+          Images.SigningKeyProvider(),
+          Images.VariantProvider(),
           Intel.IndicatorFeedPermissionProvider(),
           Intel.IndicatorFeedProvider(),
-          VulnScanner.VulnScannerCredentialProvider(),
-          VulnScanner.VulnScannerCredentialSetProvider(),
-          VulnScanner.VulnScannerTargetEnvironmentProvider(),
-        ),
-        Layer.mergeAll(
           KeylessCertificate.KeylessCertificateProvider(),
-          KV.KVNamespaceBindingPolicyLive,
-          KV.KVNamespaceProvider(),
+          KV.NamespaceProvider(),
+          KV.NamespaceProvider(),
           LeakedCredentialCheck.LeakedCredentialCheckProvider(),
           LeakedCredentialCheck.LeakedCredentialDetectionProvider(),
-          Logpush.LogpushJobProvider(),
-          LogsControl.LogsCmbConfigProvider(),
+          List.ListProvider(),
+          Location.LocationProvider(),
+          Logging.LoggingProvider(),
+          Logpush.JobProvider(),
+          LogsControl.CmbConfigProvider(),
           LogsControl.LogsRetentionFlagProvider(),
+        ),
+        Layer.mergeAll(
           MagicCloudNetworking.CatalogSyncProvider(),
           MagicCloudNetworking.CloudIntegrationProvider(),
           MagicCloudNetworking.OnRampProvider(),
-          MagicNetworkMonitoring.MagicNetworkMonitoringConfigProvider(),
-          MagicNetworkMonitoring.MagicNetworkMonitoringRuleProvider(),
+          MagicNetworkMonitoring.ConfigProvider(),
+          MagicNetworkMonitoring.RuleProvider(),
           MagicTransit.GreTunnelProvider(),
           MagicTransit.IpsecTunnelProvider(),
           MagicTransit.MagicAppProvider(),
@@ -656,128 +552,131 @@ export const providers = () =>
           MagicTransit.MagicSiteWanProvider(),
           MagicTransit.MagicStaticRouteProvider(),
           ManagedTransforms.ManagedTransformsProvider(),
+          McpPortal.McpPortalProvider(),
           MtlsCertificate.MtlsCertificateProvider(),
           NetworkInterconnects.NetworkInterconnectSettingsProvider(),
           Organization.OrganizationProvider(),
           OriginCaCertificate.OriginCaCertificateProvider(),
           OriginPostQuantumEncryption.OriginPostQuantumEncryptionProvider(),
-          OriginTlsClientAuth.OriginTlsClientAuthCertificateProvider(),
-          OriginTlsClientAuth.OriginTlsClientAuthHostnameAssociationProvider(),
-          OriginTlsClientAuth.OriginTlsClientAuthHostnameCertificateProvider(),
-          OriginTlsClientAuth.OriginTlsClientAuthSettingProvider(),
+          OriginTlsClientAuth.CertificateProvider(),
+          OriginTlsClientAuth.HostnameAssociationProvider(),
+          OriginTlsClientAuth.HostnameCertificateProvider(),
+          OriginTlsClientAuth.SettingProvider(),
           PageRule.PageRuleProvider(),
-          Pages.PagesDeploymentProvider(),
-          Pages.PagesDomainProvider(),
-          Pages.PagesProjectProvider(),
-          PageShield.PageShieldPolicyProvider(),
-          PageShield.PageShieldSettingsProvider(),
+          Pages.DeploymentProvider(),
+          Pages.DomainProvider(),
+          Pages.ProjectProvider(),
+          PageShield.PolicyProvider(),
+          PageShield.SettingsProvider(),
           Pipelines.LegacyPipelineProvider(),
           Pipelines.PipelineProvider(),
-          Pipelines.PipelineSinkProvider(),
-          Pipelines.PipelineStreamProvider(),
-          Queue.QueueBindingPolicyLive,
-          Queue.QueueConsumerProvider(),
-          Queue.QueueEventSourcePolicyLive,
+          Pipelines.SinkProvider(),
+          Pipelines.StreamProvider(),
+          ProxyEndpoint.ProxyEndpointProvider(),
+          Queue.ConsumerProvider(),
+          Queue.ConsumerProvider(),
           Queue.QueueProvider(),
-          Queue.QueueSubscriptionProvider(),
-          R2.R2BucketBindingPolicyLive,
-          R2.R2BucketEventNotificationProvider(),
-          R2.R2BucketProvider(),
-          R2.R2BucketSippyProvider(),
-          R2DataCatalog.R2DataCatalogProvider(),
-          RateLimit.RateLimitBindingPolicyLive,
-          RealtimeKit.RealtimeKitAppProvider(),
-          RealtimeKit.RealtimeKitPresetProvider(),
-          RealtimeKit.RealtimeKitWebhookProvider(),
+          Queue.QueueProvider(),
+          Queue.SubscriptionProvider(),
+          R2.BucketEventNotificationProvider(),
+          R2.BucketProvider(),
+          R2.BucketProvider(),
+          R2.BucketSippyProvider(),
+          R2.DataCatalogProvider(),
+          RealtimeKit.AppProvider(),
+          RealtimeKit.PresetProvider(),
+          RealtimeKit.WebhookProvider(),
           RegionalHostname.RegionalHostnameProvider(),
-          Registrar.RegistrarDomainProvider(),
+          Registrar.DomainProvider(),
           ResourceSharing.ShareProvider(),
           ResourceSharing.ShareRecipientProvider(),
           ResourceSharing.ShareResourceProvider(),
-          RiskScoring.RiskScoringIntegrationProvider(),
-          Rules.RulesListProvider(),
+          RiskScoring.IntegrationProvider(),
+          Rule.RuleProvider(),
+          Rule.RuleProvider(),
+          Rules.ListProvider(),
+          Ruleset.AccountEntrypointProvider(),
           Ruleset.CustomRulesetProvider(),
-          Ruleset.RulesetAccountEntrypointProvider(),
           Ruleset.RulesetProvider(),
-          Rum.RumRuleProvider(),
-          Rum.RumSiteProvider(),
-          SchemaValidation.SchemaValidationOperationSettingProvider(),
-          SchemaValidation.SchemaValidationSchemaProvider(),
-          SchemaValidation.SchemaValidationSettingsProvider(),
-          SecretsStore.SecretBindingPolicyLive,
+          Ruleset.RulesetProvider(),
+          Rum.RuleProvider(),
+          Rum.SiteProvider(),
+          SchemaValidation.OperationSettingProvider(),
+          SchemaValidation.SchemaProvider(),
+          SchemaValidation.SettingsProvider(),
           SecretsStore.SecretsStoreProvider(),
+          SecretsStore.SecretsStoreProvider(),
+          SecretsStore.StoreSecretProvider(),
           SecretsStore.StoreSecretProvider(),
           SecurityTxt.SecurityTxtProvider(),
           Snippets.SnippetProvider(),
           Snippets.SnippetRulesProvider(),
-          Spectrum.SpectrumApplicationProvider(),
-          Speed.SpeedTestScheduleProvider(),
+          Spectrum.ApplicationProvider(),
+          Speed.TestScheduleProvider(),
           Ssl.CertificatePackProvider(),
           Ssl.UniversalSslProvider(),
-          Stream.StreamLiveInputOutputProvider(),
-          Stream.StreamLiveInputProvider(),
-          Stream.StreamSigningKeyProvider(),
-          Stream.StreamWatermarkProvider(),
-          Stream.StreamWebhookProvider(),
+          Stream.LiveInputOutputProvider(),
+          Stream.LiveInputProvider(),
+          Stream.SigningKeyProvider(),
+          Stream.WatermarkProvider(),
+          Stream.WebhookProvider(),
+          Tag.TagProvider(),
           Tags.AccountResourceTagsProvider(),
           Tags.ZoneResourceTagsProvider(),
+          TokenValidation.RuleProvider(),
           TokenValidation.TokenConfigurationProvider(),
-          TokenValidation.TokenValidationRuleProvider(),
-          Tunnel.TunnelConfigurationProvider(),
-          Tunnel.TunnelHostnameRouteProvider(),
+          Tunnel.ConfigurationProvider(),
+          Tunnel.ConfigurationProvider(),
+          Tunnel.HostnameRouteProvider(),
+          Tunnel.RouteProvider(),
+          Tunnel.RouteProvider(),
+          Tunnel.TunnelProvider(),
           Tunnel.TunnelProvider(),
-          Tunnel.TunnelReadPolicyLive,
-          Tunnel.TunnelReadWritePolicyLive,
-          Tunnel.TunnelRouteProvider(),
-          Tunnel.TunnelVirtualNetworkProvider(),
-          Tunnel.TunnelWarpConnectorProvider(),
-          Tunnel.TunnelWritePolicyLive,
-          Turnstile.TurnstileWidgetProvider(),
+          Tunnel.VirtualNetworkProvider(),
+          Tunnel.WarpConnectorProvider(),
+        ),
+        Layer.mergeAll(
+          Turnstile.WidgetProvider(),
           UrlNorm.UrlNormalizationProvider(),
-          Vectorize.VectorizeIndexBindingPolicyLive,
-          Vectorize.VectorizeIndexProvider(),
-          Vectorize.VectorizeMetadataIndexProvider(),
+          Vectorize.IndexProvider(),
+          Vectorize.IndexProvider(),
+          Vectorize.MetadataIndexProvider(),
+          Vectorize.MetadataIndexProvider(),
+          VpcService.VpcServiceProvider(),
           VpcService.VpcServiceProvider(),
+          VulnScanner.VulnScannerCredentialProvider(),
+          VulnScanner.VulnScannerCredentialSetProvider(),
+          VulnScanner.VulnScannerTargetEnvironmentProvider(),
+          WaitingRoom.SettingsProvider(),
           WaitingRoom.WaitingRoomProvider(),
-          WaitingRoom.WaitingRoomSettingsProvider(),
-          Web3.Web3HostnameContentListProvider(),
-          Web3.Web3HostnameProvider(),
-          Workers.BindWorkerPolicyLive,
-          Workers.CronEventSourcePolicyLive,
-          Workers.FetchPolicyLive,
+          Web3.HostnameContentListProvider(),
+          Web3.HostnameProvider(),
+          Workers.AccountSettingProvider(),
           Workers.ObservabilityDestinationProvider(),
-          Workers.VersionMetadataBindingPolicyLive,
+          Workers.SubdomainProvider(),
+          Workers.WorkerProvider(),
           Workers.WorkerProvider(),
           Workers.WorkerRouteProvider(),
-          Workers.WorkersAccountSettingProvider(),
-          Workers.WorkersSubdomainProvider(),
           WorkersForPlatforms.DispatchNamespaceProvider(),
           Workflows.WorkflowProvider(),
-          Zaraz.ZarazConfigProvider(),
-          Zone.ZoneCustomNameserversProvider(),
-          Zone.ZoneHoldProvider(),
+          Workflows.WorkflowProvider(),
+          Zaraz.ConfigProvider(),
+          Zaraz.ConfigProvider(),
+          Zone.CustomNameserversProvider(),
+          Zone.HoldProvider(),
+          Zone.SettingProvider(),
+          Zone.ZoneProvider(),
           Zone.ZoneProvider(),
-          Zone.ZoneSettingProvider(),
-        ),
-        Layer.mergeAll(
-          Dns.AccountDnsSettingsProvider(),
-          Dns.DnsViewProvider(),
-          Dns.ZoneTransferAclProvider(),
-          Dns.ZoneTransferIncomingProvider(),
-          Dns.ZoneTransferOutgoingProvider(),
-          Dns.ZoneTransferPeerProvider(),
-          Dns.ZoneTransferTsigProvider(),
-          GoogleTagGateway.GoogleTagGatewayProvider(),
         ),
       ),
     ),
     Layer.provideMerge(
       Layer.mergeAll(
         LoadBalancer.LoadBalancerProvider(),
-        LoadBalancer.LoadBalancerMonitorProvider(),
-        LoadBalancer.LoadBalancerMonitorGroupProvider(),
-        LoadBalancer.LoadBalancerPoolProvider(),
-        Build.CommandProvider(),
+        LoadBalancer.MonitorProvider(),
+        LoadBalancer.MonitorGroupProvider(),
+        LoadBalancer.PoolProvider(),
+        Command.providers(),
         KeyPairProvider(),
         RandomProvider(),
       ),
@@ -818,7 +717,7 @@ const cloudflareRetryFactory: Retry.Factory = (lastError) => {
     schedule: pipe(
       Schedule.exponential(Duration.millis(250), 2),
       Schedule.modifyDelay(
-        Effect.fnUntraced(function* (duration) {
+        Effect.fn(function* (duration) {
           const error = yield* Ref.get(lastError);
           // Throttling errors (429): honor a 500ms floor matching the
           // distilled default.