alchemy 2.0.0-beta.60 → 2.0.0-beta.61

package/src/Cloudflare/Auth/AuthProvider.ts

@@ -126,6 +126,43 @@ const selectAccount = (accessToken: string) =>
     }).pipe(retryOnce);
   }).pipe((e) => withOAuthCredentials(accessToken, e));
 
+/**
+ * Cloudflare account IDs are 32 lowercase hex characters. Placeholder
+ * values ("", "-", "dummy", …) end up interpolated into API paths and
+ * surface as baffling `InvalidRoute: Could not route to
+ * /accounts/<value>/...` errors, so reject them up front with an
+ * actionable message instead.
+ */
+const ACCOUNT_ID_PATTERN = /^[0-9a-f]{32}$/i;
+
+export const validateAccountId = (
+  accountId: string | undefined,
+  source: string,
+): Effect.Effect<string, AuthError> => {
+  const trimmed = accountId?.trim() ?? "";
+  if (trimmed.length === 0) {
+    return Effect.fail(
+      new AuthError({
+        message:
+          `Cloudflare account ID is missing (${source}). ` +
+          "Set CLOUDFLARE_ACCOUNT_ID or re-run 'alchemy login' and provide your account ID " +
+          "(found in the Cloudflare dashboard under Workers & Pages → Account details).",
+      }),
+    );
+  }
+  if (!ACCOUNT_ID_PATTERN.test(trimmed)) {
+    return Effect.fail(
+      new AuthError({
+        message:
+          `'${trimmed}' is not a valid Cloudflare account ID (${source}) — expected 32 hex characters. ` +
+          "Copy the account ID from the Cloudflare dashboard (Workers & Pages → Account details) " +
+          "into CLOUDFLARE_ACCOUNT_ID or re-run 'alchemy login'.",
+      }),
+    );
+  }
+  return Effect.succeed(trimmed.toLowerCase());
+};
+
 const promptAccountId = () =>
   getEnv("CLOUDFLARE_ACCOUNT_ID").pipe(
     Effect.flatMap((envAccountId) =>
@@ -133,6 +170,10 @@ const promptAccountId = () =>
         message: "Cloudflare Account ID (Enter to skip)",
         placeholder: envAccountId ?? "",
         defaultValue: envAccountId ?? "",
+        validate: (v) =>
+          v.trim().length === 0 || ACCOUNT_ID_PATTERN.test(v.trim())
+            ? undefined
+            : "Expected a 32-character hex account ID (Workers & Pages → Account details)",
       }).pipe(retryOnce),
     ),
   );
@@ -324,7 +365,13 @@ export const CloudflareAuth = AuthProviderLayer<
         Match.when(
           { method: "env" },
           Effect.fn(function* () {
-            const accountId = yield* getEnvRequired("CLOUDFLARE_ACCOUNT_ID");
+            const accountId = yield* getEnvRequired(
+              "CLOUDFLARE_ACCOUNT_ID",
+            ).pipe(
+              Effect.flatMap((id) =>
+                validateAccountId(id, "from the CLOUDFLARE_ACCOUNT_ID env var"),
+              ),
+            );
             const apiToken = yield* getEnvRedacted("CLOUDFLARE_API_TOKEN");
             if (apiToken) {
               return {
@@ -363,29 +410,43 @@ export const CloudflareAuth = AuthProviderLayer<
                           "Cloudflare stored credentials not found. Run: alchemy-effect login --configure",
                       }),
                     )
-                  : Effect.succeed(
-                      Match.value(creds).pipe(
+                  : Effect.gen(function* () {
+                      // The account ID prompt is skippable, so stored
+                      // credentials may carry an empty accountId; fall
+                      // back to the env var before validating.
+                      const envAccountId = yield* getEnv(
+                        "CLOUDFLARE_ACCOUNT_ID",
+                      );
+                      const accountId = yield* validateAccountId(
+                        creds.accountId?.trim() || envAccountId,
+                        `stored for profile '${profileName}'`,
+                      );
+                      return Match.value(creds).pipe(
                         Match.when({ type: "apiToken" }, (c) => ({
                           type: "apiToken" as const,
                           apiToken: Redacted.make(c.apiToken),
-                          accountId: c.accountId,
+                          accountId,
                           source: { type: "stored" as const },
                         })),
                         Match.when({ type: "apiKey" }, (c) => ({
                           type: "apiKey" as const,
                           apiKey: Redacted.make(c.apiKey),
                           email: Redacted.make(c.email),
-                          accountId: c.accountId,
+                          accountId,
                           source: { type: "stored" as const },
                         })),
                         Match.exhaustive,
-                      ),
-                    ),
+                      );
+                    }),
               ),
             ),
         ),
         Match.when({ method: "oauth" }, (cfg) =>
           Effect.gen(function* () {
+            const accountId = yield* validateAccountId(
+              cfg.accountId,
+              `configured for profile '${profileName}'`,
+            );
             const creds = yield* store.read<OAuthClient.OAuthCredentials>(
               profileName,
               "cf-oauth",
@@ -421,7 +482,7 @@ export const CloudflareAuth = AuthProviderLayer<
               type: "oauth" as const,
               accessToken: Redacted.make(fresh.access),
               expires: fresh.expires,
-              accountId: cfg.accountId,
+              accountId,
               source: { type: "oauth" as const },
             };
           }),

package/src/Cloudflare/BotManagement/BotManagement.ts

@@ -222,7 +222,9 @@ export type BotManagement = Resource<
  *
  * @see https://developers.cloudflare.com/bots/
  */
-export const BotManagement = Resource<BotManagement>(TypeId);
+export const BotManagement = Resource<BotManagement>(TypeId, {
+  aliases: ["Cloudflare.BotManagement"],
+});
 
 /**
  * Returns true if the given value is a BotManagement resource.

package/src/Cloudflare/Cache/Reserve.ts

@@ -111,7 +111,9 @@ export type Reserve = Resource<
  *
  * @see https://developers.cloudflare.com/cache/advanced-configuration/cache-reserve/
  */
-export const Reserve = Resource<Reserve>(TypeId);
+export const Reserve = Resource<Reserve>(TypeId, {
+  aliases: ["Cloudflare.Cache.CacheReserve"],
+});
 
 /**
  * Returns true if the given value is a Reserve resource.

package/src/Cloudflare/ClientCertificate/ClientCertificate.ts

@@ -162,7 +162,9 @@ export type ClientCertificate = Resource<
  *
  * @see https://developers.cloudflare.com/ssl/client-certificates/
  */
-export const ClientCertificate = Resource<ClientCertificate>(TypeId);
+export const ClientCertificate = Resource<ClientCertificate>(TypeId, {
+  aliases: ["Cloudflare.ClientCertificate"],
+});
 
 /**
  * Returns true if the given value is a ClientCertificate resource.

package/src/Cloudflare/Containers/Container.ts

@@ -159,8 +159,8 @@ export type Container<Id extends string = string> = Named<Id> & {
  * runtime. Keeping them separate ensures the bundler only includes
  * the tiny class in the DO's output.
  *
- * See the {@link https://alchemy.run/concepts/platform | Platform
- * concept} page for how this fits into the async / effect / layer
+ * See the [Platform concept](/infrastructure-as-effects/functions-and-servers)
+ * page for how this fits into the async / effect / layer
  * progression.
  * @resource
  * @product Containers

package/src/Cloudflare/ContentScanning/ContentScanning.ts

@@ -107,7 +107,9 @@ export type ContentScanning = Resource<
  *
  * @see https://developers.cloudflare.com/waf/detections/malicious-uploads/
  */
-export const ContentScanning = Resource<ContentScanning>(TypeId);
+export const ContentScanning = Resource<ContentScanning>(TypeId, {
+  aliases: ["Cloudflare.ContentScanning"],
+});
 
 /**
  * Returns true if the given value is a ContentScanning resource.

package/src/Cloudflare/CustomCertificate/CustomCertificate.ts

@@ -244,7 +244,9 @@ export type CustomCertificate = Resource<
  *
  * @see https://developers.cloudflare.com/ssl/edge-certificates/custom-certificates/
  */
-export const CustomCertificate = Resource<CustomCertificate>(TypeId);
+export const CustomCertificate = Resource<CustomCertificate>(TypeId, {
+  aliases: ["Cloudflare.CustomCertificate"],
+});
 
 /**
  * Returns true if the given value is a CustomCertificate resource.

package/src/Cloudflare/CustomHostname/CustomHostname.ts

@@ -280,6 +280,7 @@ export type CustomHostname = Resource<
  */
 export const CustomHostname = Resource<CustomHostname>(
   "Cloudflare.CustomHostname.CustomHostname",
+  { aliases: ["Cloudflare.CustomHostname"] },
 );
 
 export const isCustomHostname = (value: unknown): value is CustomHostname =>

package/src/Cloudflare/CustomHostname/FallbackOrigin.ts

@@ -78,6 +78,7 @@ export type FallbackOrigin = Resource<
  */
 export const FallbackOrigin = Resource<FallbackOrigin>(
   "Cloudflare.CustomHostname.FallbackOrigin",
+  { aliases: ["Cloudflare.FallbackOrigin"] },
 );
 
 export const isFallbackOrigin = (value: unknown): value is FallbackOrigin =>

package/src/Cloudflare/CustomNameserver/CustomNameserver.ts

@@ -132,7 +132,9 @@ export type CustomNameserver = Resource<
  *
  * @see https://developers.cloudflare.com/dns/nameservers/custom-nameservers/account-custom-nameservers/
  */
-export const CustomNameserver = Resource<CustomNameserver>(TypeId);
+export const CustomNameserver = Resource<CustomNameserver>(TypeId, {
+  aliases: ["Cloudflare.CustomNameserver"],
+});
 
 /**
  * Returns true if the given value is a CustomNameserver resource.

package/src/Cloudflare/D1/Database.ts

@@ -6,7 +6,7 @@ import type { HttpClient } from "effect/unstable/http/HttpClient";
 import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
-import { Resource } from "../../Resource.ts";
+import { isResourceOfType, Resource } from "../../Resource.ts";
 import { listSqlFiles, readSqlFile } from "../../Sql/SqlFile.ts";
 import { recordsEqual } from "../../Util/equal.ts";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
@@ -17,7 +17,7 @@ import { cloneDatabase } from "./CloneDatabase.ts";
 import { importD1Database } from "./ImportDatabase.ts";
 
 export const isDatabase = (value: unknown): value is Database =>
-  typeof value === "object" && (value as any)?.Type === "Cloudflare.D1Database";
+  isResourceOfType(value, "Cloudflare.D1Database");
 
 export type Jurisdiction = "default" | "eu" | "fedramp";
 export type PrimaryLocationHint =

package/src/Cloudflare/DNS/AccountSettings.ts

@@ -228,7 +228,9 @@ export type AccountDnsSettings = Resource<
  * });
  * ```
  */
-export const AccountDnsSettings = Resource<AccountDnsSettings>(TypeId);
+export const AccountDnsSettings = Resource<AccountDnsSettings>(TypeId, {
+  aliases: ["Cloudflare.Dns.AccountSettings"],
+});
 
 /**
  * Returns true if the given value is an AccountDnsSettings resource.

package/src/Cloudflare/DNS/Dnssec.ts

@@ -190,7 +190,9 @@ export type Dnssec = Resource<
  * });
  * ```
  */
-export const Dnssec = Resource<Dnssec>(TypeId);
+export const Dnssec = Resource<Dnssec>(TypeId, {
+  aliases: ["Cloudflare.Dns.Dnssec"],
+});
 
 /**
  * Returns true if the given value is a Dnssec resource.

package/src/Cloudflare/DNS/Firewall.ts

@@ -238,7 +238,9 @@ export type Firewall = Resource<
  *
  * @see https://developers.cloudflare.com/dns/dns-firewall/
  */
-export const Firewall = Resource<Firewall>(TypeId);
+export const Firewall = Resource<Firewall>(TypeId, {
+  aliases: ["Cloudflare.DnsFirewall"],
+});
 
 /**
  * Returns true if the given value is a DnsFirewall resource.

package/src/Cloudflare/DNS/Record.ts

@@ -163,7 +163,9 @@ export type Record = Resource<
  * });
  * ```
  */
-export const Record = Resource<Record>("Cloudflare.DNS.Record");
+export const Record = Resource<Record>("Cloudflare.DNS.Record", {
+  aliases: ["Cloudflare.Dns.Record"],
+});
 
 export const RecordProvider = () =>
   Provider.succeed(Record, {

package/src/Cloudflare/DNS/View.ts

@@ -83,7 +83,9 @@ export type View = Resource<
  *
  * @see https://developers.cloudflare.com/dns/internal-dns/
  */
-export const View = Resource<View>(DnsViewTypeId);
+export const View = Resource<View>(DnsViewTypeId, {
+  aliases: ["Cloudflare.Dns.View"],
+});
 
 /**
  * Returns true if the given value is a View resource.

package/src/Cloudflare/DNS/ZoneSettings.ts

@@ -252,7 +252,9 @@ export type ZoneDnsSettings = Resource<
  * });
  * ```
  */
-export const ZoneDnsSettings = Resource<ZoneDnsSettings>(TypeId);
+export const ZoneDnsSettings = Resource<ZoneDnsSettings>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneSettings"],
+});
 
 /**
  * Returns true if the given value is a ZoneDnsSettings resource.

package/src/Cloudflare/DNS/ZoneTransferAcl.ts

@@ -84,7 +84,9 @@ export type ZoneTransferAcl = Resource<
  *
  * @see https://developers.cloudflare.com/dns/zone-setups/zone-transfers/
  */
-export const ZoneTransferAcl = Resource<ZoneTransferAcl>(TypeId);
+export const ZoneTransferAcl = Resource<ZoneTransferAcl>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneTransferAcl"],
+});
 
 /**
  * Returns true if the given value is a ZoneTransferAcl resource.

package/src/Cloudflare/DNS/ZoneTransferIncoming.ts

@@ -100,7 +100,9 @@ export type ZoneTransferIncoming = Resource<
  *
  * @see https://developers.cloudflare.com/dns/zone-setups/zone-transfers/setup/
  */
-export const ZoneTransferIncoming = Resource<ZoneTransferIncoming>(TypeId);
+export const ZoneTransferIncoming = Resource<ZoneTransferIncoming>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneTransferIncoming"],
+});
 
 /**
  * Returns true if the given value is a ZoneTransferIncoming resource.

package/src/Cloudflare/DNS/ZoneTransferOutgoing.ts

@@ -112,7 +112,9 @@ export type ZoneTransferOutgoing = Resource<
  *
  * @see https://developers.cloudflare.com/dns/zone-setups/zone-transfers/setup/
  */
-export const ZoneTransferOutgoing = Resource<ZoneTransferOutgoing>(TypeId);
+export const ZoneTransferOutgoing = Resource<ZoneTransferOutgoing>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneTransferOutgoing"],
+});
 
 /**
  * Returns true if the given value is a ZoneTransferOutgoing resource.

package/src/Cloudflare/DNS/ZoneTransferPeer.ts

@@ -119,7 +119,9 @@ export type ZoneTransferPeer = Resource<
  *
  * @see https://developers.cloudflare.com/dns/zone-setups/zone-transfers/
  */
-export const ZoneTransferPeer = Resource<ZoneTransferPeer>(TypeId);
+export const ZoneTransferPeer = Resource<ZoneTransferPeer>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneTransferPeer"],
+});
 
 /**
  * Returns true if the given value is a ZoneTransferPeer resource.

package/src/Cloudflare/DNS/ZoneTransferTsig.ts

@@ -91,7 +91,9 @@ export type ZoneTransferTsig = Resource<
  *
  * @see https://developers.cloudflare.com/dns/zone-setups/zone-transfers/
  */
-export const ZoneTransferTsig = Resource<ZoneTransferTsig>(TypeId);
+export const ZoneTransferTsig = Resource<ZoneTransferTsig>(TypeId, {
+  aliases: ["Cloudflare.Dns.ZoneTransferTsig"],
+});
 
 /**
  * Returns true if the given value is a ZoneTransferTsig resource.

package/src/Cloudflare/Email/Address.ts

@@ -55,7 +55,9 @@ export type Address = Resource<
  * Cloudflare sends a verification email when the address is first created.
  * The address must be verified before it can receive routed mail.
  */
-export const Address = Resource<Address>("Cloudflare.Email.Address");
+export const Address = Resource<Address>("Cloudflare.Email.Address", {
+  aliases: ["Cloudflare.EmailAddress"],
+});
 
 const toAttrs = (
   accountId: string,

package/src/Cloudflare/Email/AllowPolicy.ts

@@ -144,6 +144,7 @@ export type AllowPolicy = Resource<
  */
 export const AllowPolicy = Resource<AllowPolicy>(
   EmailSecurityAllowPolicyTypeId,
+  { aliases: ["Cloudflare.EmailSecurity.AllowPolicy"] },
 );
 
 /**

package/src/Cloudflare/Email/BlockSender.ts

@@ -104,6 +104,7 @@ export type BlockSender = Resource<
  */
 export const BlockSender = Resource<BlockSender>(
   EmailSecurityBlockSenderTypeId,
+  { aliases: ["Cloudflare.EmailSecurity.BlockSender"] },
 );
 
 /**

package/src/Cloudflare/Email/CatchAll.ts

@@ -124,7 +124,9 @@ export type CatchAll = Resource<
  * });
  * ```
  */
-export const CatchAll = Resource<CatchAll>(CatchAllTypeId);
+export const CatchAll = Resource<CatchAll>(CatchAllTypeId, {
+  aliases: ["Cloudflare.EmailCatchAll"],
+});
 
 /**
  * Returns true if the given value is an CatchAll resource.
@@ -178,7 +180,10 @@ export const CatchAllProvider = () =>
 
     read: Effect.fn(function* ({ output, olds }) {
       const zoneId =
-        output?.zoneId ?? (olds ? yield* resolve(olds.zone) : undefined);
+        // `olds.zone` may be `undefined` when a `creating` row was persisted
+        // before upstream Outputs resolved — report "not found" then.
+        output?.zoneId ??
+        (olds?.zone !== undefined ? yield* resolve(olds.zone) : undefined);
       if (!zoneId) return undefined;
       const observed = yield* emailRouting.getRuleCatchAll({ zoneId }).pipe(
         // Zone deleted out-of-band (or the token can no longer see it) —

package/src/Cloudflare/Email/Domain.ts

@@ -170,7 +170,9 @@ export type Domain = Resource<
  *
  * @see https://developers.cloudflare.com/cloudflare-one/email-security/
  */
-export const Domain = Resource<Domain>(EmailSecurityDomainTypeId);
+export const Domain = Resource<Domain>(EmailSecurityDomainTypeId, {
+  aliases: ["Cloudflare.EmailSecurity.Domain"],
+});
 
 /**
  * Returns true if the given value is an Domain resource.

package/src/Cloudflare/Email/ImpersonationRegistryEntry.ts

@@ -107,6 +107,7 @@ export type ImpersonationRegistryEntry = Resource<
  */
 export const ImpersonationRegistryEntry = Resource<ImpersonationRegistryEntry>(
   EmailSecurityImpersonationRegistryEntryTypeId,
+  { aliases: ["Cloudflare.EmailSecurity.ImpersonationRegistryEntry"] },
 );
 
 /**

package/src/Cloudflare/Email/Routing.ts

@@ -71,7 +71,9 @@ export type Routing = Resource<
  * });
  * ```
  */
-export const Routing = Resource<Routing>("Cloudflare.Email.Routing");
+export const Routing = Resource<Routing>("Cloudflare.Email.Routing", {
+  aliases: ["Cloudflare.EmailRouting"],
+});
 
 const resolve = Effect.fn(function* (zone: Reference) {
   const { accountId } = yield* yield* CloudflareEnvironment;

package/src/Cloudflare/Email/Rule.ts

@@ -84,7 +84,9 @@ export type Rule = Resource<
  * });
  * ```
  */
-export const Rule = Resource<Rule>("Cloudflare.Email.Rule");
+export const Rule = Resource<Rule>("Cloudflare.Email.Rule", {
+  aliases: ["Cloudflare.EmailRule"],
+});
 
 export const RuleProvider = () =>
   Provider.succeed(Rule, {

package/src/Cloudflare/Email/SendingSubdomain.ts

@@ -113,6 +113,7 @@ export type SendingSubdomain = Resource<
  */
 export const SendingSubdomain = Resource<SendingSubdomain>(
   SendingSubdomainTypeId,
+  { aliases: ["Cloudflare.EmailSendingSubdomain"] },
 );
 
 /**

package/src/Cloudflare/Email/TrustedDomain.ts

@@ -106,6 +106,7 @@ export type TrustedDomain = Resource<
  */
 export const TrustedDomain = Resource<TrustedDomain>(
   EmailSecurityTrustedDomainTypeId,
+  { aliases: ["Cloudflare.EmailSecurity.TrustedDomain"] },
 );
 
 /**

package/src/Cloudflare/Fetcher.ts

@@ -70,11 +70,18 @@ export const fromCloudflareFetcher = (
   fetcher: cf.Fetcher | globalThis.Fetcher,
 ): Fetcher => {
   const fetch = (request: Request) =>
-    Effect.promise((signal) =>
-      (fetcher as globalThis.Fetcher).fetch(request, {
-        signal: signal,
-      }),
-    ).pipe(
+    Effect.suspend(() => {
+      // Clone per attempt, keeping `request` pristine: the HandlerNotReady
+      // retry below re-runs this suspend, and replaying a Request whose body
+      // the failed attempt already consumed makes workerd reject with
+      // "TypeError: Cannot reconstruct a Request with a used body".
+      const attempt = request.clone() as Request;
+      return Effect.promise((signal) =>
+        (fetcher as globalThis.Fetcher).fetch(attempt, {
+          signal: signal,
+        }),
+      );
+    }).pipe(
       // The "Handler does not export a fetch()" window is a property of
       // invoking a freshly-deployed Cloudflare binding, so it is ridden out
       // HERE — the one adapter every binding flows through — rather than in any

package/src/Cloudflare/Flagship/App.ts

@@ -1,10 +1,9 @@
 import * as flagship from "@distilled.cloud/cloudflare/flagship";
 import * as Effect from "effect/Effect";
-import * as Predicate from "effect/Predicate";
 import * as Stream from "effect/Stream";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
-import { Resource } from "../../Resource.ts";
+import { isResourceOfType, Resource } from "../../Resource.ts";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import type { Providers } from "../Providers.ts";
 
@@ -150,7 +149,7 @@ export const App = Resource<App>(TypeId);
  * Returns true if the given value is a Flagship App resource.
  */
 export const isApp = (value: unknown): value is App =>
-  Predicate.hasProperty(value, "Type") && value.Type === TypeId;
+  isResourceOfType(value, TypeId);
 
 export const AppProvider = () =>
   Provider.succeed(App, {

package/src/Cloudflare/Fraud/DetectionSettings.ts

@@ -157,7 +157,9 @@ export type DetectionSettings = Resource<
  *
  * @see https://developers.cloudflare.com/bots/additional-configurations/fraud-detection/
  */
-export const DetectionSettings = Resource<DetectionSettings>(TypeId);
+export const DetectionSettings = Resource<DetectionSettings>(TypeId, {
+  aliases: ["Cloudflare.FraudDetectionSettings"],
+});
 
 /**
  * Returns true if the given value is a DetectionSettings resource.

package/src/Cloudflare/GoogleTagGateway/GoogleTagGateway.ts

@@ -129,7 +129,9 @@ export type GoogleTagGateway = Resource<
  *
  * @see https://developers.cloudflare.com/google-tag-gateway/
  */
-export const GoogleTagGateway = Resource<GoogleTagGateway>(TypeId);
+export const GoogleTagGateway = Resource<GoogleTagGateway>(TypeId, {
+  aliases: ["Cloudflare.GoogleTagGateway"],
+});
 
 /**
  * Returns true if the given value is a GoogleTagGateway resource.
@@ -187,7 +189,10 @@ export const GoogleTagGatewayProvider = () =>
 
     read: Effect.fn(function* ({ output, olds }) {
       const zoneId =
-        output?.zoneId ?? (olds ? yield* resolve(olds.zone) : undefined);
+        // `olds.zone` may be `undefined` when a `creating` row was persisted
+        // before upstream Outputs resolved — report "not found" then.
+        output?.zoneId ??
+        (olds?.zone !== undefined ? yield* resolve(olds.zone) : undefined);
       if (!zoneId) return undefined;
       const observed = yield* googleTagGateway.getConfig({ zoneId }).pipe(
         // Zone deleted out-of-band — the config is gone with it.

package/src/Cloudflare/Healthcheck/Healthcheck.ts

@@ -293,7 +293,9 @@ export type Healthcheck = Resource<TypeId, Props, Attributes, never, Providers>;
  *
  * @see https://developers.cloudflare.com/health-checks/
  */
-export const Healthcheck = Resource<Healthcheck>(TypeId);
+export const Healthcheck = Resource<Healthcheck>(TypeId, {
+  aliases: ["Cloudflare.Healthcheck"],
+});
 
 /**
  * Returns true if the given value is a Healthcheck resource.

package/src/Cloudflare/HostnameTlsSetting/HostnameTlsSetting.ts

@@ -150,7 +150,9 @@ export type HostnameTlsSetting = Resource<
  * @see https://developers.cloudflare.com/ssl/edge-certificates/additional-options/custom-metadata/
  * @see https://developers.cloudflare.com/api/resources/hostnames/subresources/settings/subresources/tls/
  */
-export const HostnameTlsSetting = Resource<HostnameTlsSetting>(TypeId);
+export const HostnameTlsSetting = Resource<HostnameTlsSetting>(TypeId, {
+  aliases: ["Cloudflare.HostnameTlsSetting"],
+});
 
 /**
  * Returns true if the given value is a HostnameTlsSetting resource.

package/src/Cloudflare/Hyperdrive/Connection.ts

@@ -1,6 +1,5 @@
 import * as hyperdrive from "@distilled.cloud/cloudflare/hyperdrive";
 import * as Effect from "effect/Effect";
-import * as Predicate from "effect/Predicate";
 import * as Redacted from "effect/Redacted";
 import * as Stream from "effect/Stream";
 
@@ -8,7 +7,7 @@ import { AlchemyContext } from "../../AlchemyContext.ts";
 import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
-import { Resource } from "../../Resource.ts";
+import { isResourceOfType, Resource } from "../../Resource.ts";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import { generateLocalId, isLiveId } from "../LocalRuntime.ts";
 import type { Providers } from "../Providers.ts";
@@ -160,8 +159,7 @@ export type Connection = Resource<
 export const Connection = Resource<Connection>("Cloudflare.Hyperdrive");
 
 export const isHyperdriveConnection = (value: unknown): value is Connection =>
-  Predicate.hasProperty(value, "Type") &&
-  value.Type === "Cloudflare.Hyperdrive";
+  isResourceOfType(value, "Cloudflare.Hyperdrive");
 
 export const ConnectionProvider = () =>
   Provider.succeed(Connection, {