alchemy 2.0.0-beta.37 → 2.0.0-beta.39

package/src/Cloudflare/Email/SendEmailBinding.ts

@@ -0,0 +1,124 @@
+import type * as runtime from "@cloudflare/workers-types";
+import * as Data from "effect/Data";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Binding from "../../Binding.ts";
+import type { ResourceLike } from "../../Resource.ts";
+import { isWorker, WorkerEnvironment } from "../Workers/Worker.ts";
+import type { SendEmail } from "./SendEmail.ts";
+
+/**
+ * Email body shape for the builder-form `send` call. Either `text`, `html`,
+ * or both must be provided.
+ */
+export interface SendEmailMessage {
+  from: string | runtime.EmailAddress;
+  to: string | string[];
+  subject: string;
+  replyTo?: string | runtime.EmailAddress;
+  cc?: string | string[];
+  bcc?: string | string[];
+  headers?: Record<string, string>;
+  text?: string;
+  html?: string;
+  attachments?: runtime.EmailAttachment[];
+}
+
+export class SendEmailError extends Data.TaggedError("SendEmailError")<{
+  message: string;
+  cause?: unknown;
+}> {}
+
+export interface SendEmailClient {
+  /**
+   * The raw runtime `SendEmail` binding. Use this when you need direct
+   * access to the Cloudflare object (e.g. to send a pre-built
+   * `EmailMessage` from `cloudflare:email`).
+   */
+  raw: Effect.Effect<runtime.SendEmail, never, WorkerEnvironment>;
+  /**
+   * Send an email using the builder form. Equivalent to calling
+   * `env.<name>.send({ from, to, subject, text, html, ... })`.
+   */
+  send(
+    message: SendEmailMessage,
+  ): Effect.Effect<runtime.EmailSendResult, SendEmailError, WorkerEnvironment>;
+  /**
+   * Send a raw `EmailMessage` (constructed via `cloudflare:email`).
+   */
+  sendRaw(
+    message: runtime.EmailMessage,
+  ): Effect.Effect<runtime.EmailSendResult, SendEmailError, WorkerEnvironment>;
+}
+
+/**
+ * A typed runtime accessor for a Cloudflare `send_email` Worker binding.
+ *
+ * @binding
+ */
+export class SendEmailBinding extends Binding.Service<
+  SendEmailBinding,
+  (sender: SendEmail) => Effect.Effect<SendEmailClient>
+>()("Cloudflare.SendEmail.Binding") {}
+
+export const SendEmailBindingLive = Layer.effect(
+  SendEmailBinding,
+  Effect.gen(function* () {
+    const bind = yield* SendEmailBindingPolicy;
+
+    return Effect.fnUntraced(function* (sender: SendEmail) {
+      yield* bind(sender);
+
+      const raw = WorkerEnvironment.useSync(
+        (env) => (env as Record<string, runtime.SendEmail>)[sender.name]!,
+      );
+
+      const tryPromise = <T>(
+        fn: () => Promise<T>,
+      ): Effect.Effect<T, SendEmailError> =>
+        Effect.tryPromise({
+          try: fn,
+          catch: (error: any) =>
+            new SendEmailError({
+              message: error?.message ?? "Unknown send_email error",
+              cause: error,
+            }),
+        });
+
+      return {
+        raw,
+        send: (message: SendEmailMessage) =>
+          raw.pipe(Effect.flatMap((s) => tryPromise(() => s.send(message)))),
+        sendRaw: (message: runtime.EmailMessage) =>
+          raw.pipe(Effect.flatMap((s) => tryPromise(() => s.send(message)))),
+      } satisfies SendEmailClient;
+    });
+  }),
+);
+
+export class SendEmailBindingPolicy extends Binding.Policy<
+  SendEmailBindingPolicy,
+  (sender: SendEmail) => Effect.Effect<void>
+>()("Cloudflare.SendEmail.Binding") {}
+
+export const SendEmailBindingPolicyLive = SendEmailBindingPolicy.layer.succeed(
+  Effect.fnUntraced(function* (host: ResourceLike, sender: SendEmail) {
+    if (isWorker(host)) {
+      yield* host.bind(sender.name, {
+        bindings: [
+          {
+            type: "send_email",
+            name: sender.name,
+            destinationAddress: sender.destinationAddress,
+            allowedDestinationAddresses: sender.allowedDestinationAddresses,
+            allowedSenderAddresses: sender.allowedSenderAddresses,
+          },
+        ],
+      });
+    } else {
+      return yield* Effect.die(
+        new Error(`SendEmailBinding does not support runtime '${host.Type}'`),
+      );
+    }
+  }),
+);

package/src/Cloudflare/Email/index.ts

@@ -0,0 +1,5 @@
+export * from "./EmailAddress.ts";
+export * from "./EmailRouting.ts";
+export * from "./EmailRule.ts";
+export * from "./SendEmail.ts";
+export * from "./SendEmailBinding.ts";

package/src/Cloudflare/Images/ImagesBinding.ts

@@ -87,7 +87,7 @@ export const ImagesBindingLive = Layer.effect(
 
     return Effect.fn(function* (images: ImagesLike) {
       yield* Policy(images);
-      const env = WorkerEnvironment.asEffect();
+      const env = WorkerEnvironment;
       const raw = env.pipe(
         Effect.map(
           (env) => (env as Record<string, cf.ImagesBinding>)[images.name]!,

package/src/Cloudflare/KV/KVNamespaceBinding.ts

@@ -229,7 +229,7 @@ export const KVNamespaceBindingLive = Layer.effect(
 
     return Effect.fn(function* (bucket: KVNamespace) {
       yield* bind(bucket);
-      const env = WorkerEnvironment.asEffect();
+      const env = WorkerEnvironment;
       const raw = env.pipe(
         Effect.map(
           (env) =>

package/src/Cloudflare/Local/SidecarServer.ts

@@ -55,7 +55,7 @@ const services = Layer.provideMerge(
   PlatformServices,
 );
 
-RpcServer.makeRpcServer(Sidecar.asEffect(), SidecarSchema).pipe(
+RpcServer.makeRpcServer(Sidecar, SidecarSchema).pipe(
   Effect.provide(services),
   Effect.scoped,
   runMain,

package/src/Cloudflare/Providers.ts

@@ -21,6 +21,7 @@ import * as CloudflareEnvironment from "./CloudflareEnvironment.ts";
 import * as Containers from "./Container/index.ts";
 import * as Credentials from "./Credentials.ts";
 import * as D1 from "./D1/index.ts";
+import * as Email from "./Email/index.ts";
 import * as Hyperdrive from "./Hyperdrive/index.ts";
 import * as Images from "./Images/index.ts";
 import * as KV from "./KV/index.ts";
@@ -57,6 +58,10 @@ export const providers = () =>
       Containers.Container,
       D1.D1ConnectionPolicy,
       D1.D1Database,
+      Email.EmailAddress,
+      Email.EmailRouting,
+      Email.EmailRule,
+      Email.SendEmailBindingPolicy,
       Hyperdrive.Hyperdrive,
       Hyperdrive.HyperdriveBindingPolicy,
       Images.ImagesBindingPolicy,
@@ -92,6 +97,10 @@ export const providers = () =>
         Containers.ContainerProvider(),
         D1.D1ConnectionPolicyLive,
         D1.DatabaseProvider(),
+        Email.EmailAddressProvider(),
+        Email.EmailRoutingProvider(),
+        Email.EmailRuleProvider(),
+        Email.SendEmailBindingPolicyLive,
         Hyperdrive.HyperdriveBindingPolicyLive,
         Hyperdrive.HyperdriveProvider(),
         Images.ImagesBindingPolicyLive,

package/src/Cloudflare/Queue/QueueBinding.ts

@@ -71,7 +71,7 @@ export const QueueBindingLive = Layer.effect(
 
     return Effect.fn(function* (queue: Queue) {
       yield* bind(queue);
-      const env = WorkerEnvironment.asEffect();
+      const env = WorkerEnvironment;
       const raw = env.pipe(
         Effect.map((env) => (env as Record<string, any>)[queue.LogicalId]),
       );

package/src/Cloudflare/R2/R2BucketBinding.ts

@@ -146,7 +146,7 @@ export const R2BucketBindingLive = Layer.effect(
 
     return Effect.fn(function* (bucket: R2Bucket) {
       yield* bind(bucket);
-      const env = WorkerEnvironment.asEffect();
+      const env = WorkerEnvironment;
       const raw = env.pipe(
         Effect.map(
           (env) => (env as Record<string, runtime.R2Bucket>)[bucket.LogicalId],

package/src/Cloudflare/SecretsStore/SecretBinding.ts

@@ -45,7 +45,7 @@ export const SecretBindingLive = Layer.effect(
 
     return Effect.fn(function* (secret: Secret) {
       yield* bind(secret);
-      const env = WorkerEnvironment.asEffect();
+      const env = WorkerEnvironment;
       const raw = env.pipe(
         Effect.map(
           (env) =>

package/src/Cloudflare/Workers/Assets.ts

@@ -6,6 +6,7 @@ import * as Path from "effect/Path";
 import type { PlatformError } from "effect/PlatformError";
 import type { ScopedPlanStatusSession } from "../../Cli/Cli.ts";
 import { sha256, sha256Object } from "../../Util/index.ts";
+import createIgnore from "../../Util/ignore.ts";
 
 const MAX_ASSET_SIZE = 1024 * 1024 * 25; // 25MB
 const MAX_ASSET_COUNT = 20_000;
@@ -97,12 +98,10 @@ const maybeReadString = Effect.fnUntraced(function* (file: string) {
   );
 });
 
-const createIgnoreMatcher = Effect.fnUntraced(function* (patterns: string[]) {
-  const matcher = yield* Effect.promise(() =>
-    import("ignore").then(({ default: ignore }) => ignore().add(patterns)),
-  );
+const createIgnoreMatcher = (patterns: string[]) => {
+  const matcher = createIgnore().add(patterns);
   return (file: string) => matcher.ignores(file);
-});
+};
 
 export const readAssets = Effect.fnUntraced(function* (props: AssetsProps) {
   const fs = yield* FileSystem.FileSystem;
@@ -114,7 +113,7 @@ export const readAssets = Effect.fnUntraced(function* (props: AssetsProps) {
     maybeReadString(path.join(resolvedDirectory, "_headers")),
     maybeReadString(path.join(resolvedDirectory, "_redirects")),
   ]);
-  const ignores = yield* createIgnoreMatcher([
+  const ignores = createIgnoreMatcher([
     ".assetsignore",
     "_headers",
     "_redirects",

package/src/Cloudflare/Workers/HttpServer.ts

@@ -1,9 +1,12 @@
 import type * as cf from "@cloudflare/workers-types";
 import * as Cause from "effect/Cause";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import type { Scope } from "effect/Scope";
 import type { HttpBodyError } from "effect/unstable/http/HttpBody";
+import * as EffectHttp from "effect/unstable/http/HttpEffect";
+import { ClientAbort } from "effect/unstable/http/HttpServerError";
 import * as HttpServerError from "effect/unstable/http/HttpServerError";
 import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
 import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse";
@@ -48,6 +51,10 @@ export const serveWebRequest = <Req = never>(
   Exclude<Req, HttpServerRequest.HttpServerRequest | Scope>
 > =>
   Effect.gen(function* () {
+    const context =
+      yield* Effect.context<
+        Exclude<Req, HttpServerRequest.HttpServerRequest | Scope>
+      >();
     const request = HttpServerRequest.fromWeb(
       webRequest as any as globalThis.Request,
     ).modify({
@@ -61,9 +68,7 @@ export const serveWebRequest = <Req = never>(
         }),
     });
 
-    const response = yield* handler.pipe(
-      Effect.provideService(HttpServerRequest.HttpServerRequest, request),
-      Effect.provideService(Request, webRequest as any),
+    const safeHandler = handler.pipe(
       Effect.catchCause((cause) => {
         const message = Option.match(Cause.findErrorOption(cause), {
           onNone: () => "Internal Server Error",
@@ -81,7 +86,34 @@ export const serveWebRequest = <Req = never>(
       }),
     );
 
-    return HttpServerResponse.toWeb(response, {
-      context: yield* Effect.context(),
+    const resolveSymbol = Symbol.for("@effect/platform/HttpApp/resolve");
+    const httpApp = EffectHttp.toHandled(safeHandler, (request, response) => {
+      response = EffectHttp.scopeTransferToStream(response);
+      (request as any)[resolveSymbol](
+        HttpServerResponse.toWeb(response, {
+          withoutBody: request.method === "HEAD",
+          context,
+        }),
+      );
+      return Effect.void;
+    });
+
+    return yield* Effect.promise(() => {
+      return new Promise<Response>((resolve) => {
+        const contextMap = new Map<string, any>(context.mapUnsafe);
+        contextMap.set(HttpServerRequest.HttpServerRequest.key, request);
+        contextMap.set(Request.key, webRequest);
+        (request as any)[resolveSymbol] = resolve;
+        const fiber = Effect.runForkWith(Context.makeUnsafe(contextMap))(
+          httpApp as any,
+        );
+        webRequest.signal?.addEventListener(
+          "abort",
+          () => {
+            fiber.interruptUnsafe(undefined, ClientAbort.annotation);
+          },
+          { once: true },
+        );
+      });
     });
   }) as any;

package/src/Cloudflare/Workers/InferEnv.ts

@@ -97,14 +97,18 @@ export type GetBindingType<T> = T extends Cloudflare.Assets
             ? Queue<unknown>
             : T extends Cloudflare.AiGateway
               ? Ai
-              : T extends Cloudflare.AnalyticsEngineDataset
-                ? AnalyticsEngineDataset
-                : T extends Cloudflare.Artifacts
-                  ? Artifacts
-                  : T extends Cloudflare.Images
-                    ? ImagesBinding
-                    : T extends Cloudflare.Hyperdrive
-                      ? Hyperdrive
-                      : T extends Cloudflare.DurableObjectNamespaceLike
-                        ? DurableObjectNamespace<Exclude<T["Shape"], undefined>>
-                        : never;
+              : T extends Cloudflare.SendEmail
+                ? SendEmail
+                : T extends Cloudflare.AnalyticsEngineDataset
+                  ? AnalyticsEngineDataset
+                  : T extends Cloudflare.Artifacts
+                    ? Artifacts
+                    : T extends Cloudflare.Images
+                      ? ImagesBinding
+                      : T extends Cloudflare.Hyperdrive
+                        ? Hyperdrive
+                        : T extends Cloudflare.DurableObjectNamespaceLike
+                          ? DurableObjectNamespace<
+                              Exclude<T["Shape"], undefined>
+                            >
+                          : never;

package/src/Cloudflare/Workers/Worker.ts

@@ -35,11 +35,11 @@ import {
   type PlatformProps,
   type Rpc,
 } from "../../Platform.ts";
-import { isYieldableEffectLike } from "../../Util/effect.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource, type ResourceBinding } from "../../Resource.ts";
 import * as Serverless from "../../Serverless/index.ts";
 import { Stack } from "../../Stack.ts";
+import { isYieldableEffectLike } from "../../Util/effect.ts";
 import type { AiGateway } from "../AiGateway/AiGateway.ts";
 import {
   isAnalyticsEngineDataset,
@@ -51,7 +51,7 @@ import {
 } from "../Artifacts/Artifacts.ts";
 import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import { D1Database } from "../D1/D1Database.ts";
-import { fromCloudflareFetcher } from "../Fetcher.ts";
+import { isSendEmail, type SendEmail } from "../Email/SendEmail.ts";
 import type {
   Hyperdrive,
   HyperdriveDevOrigin,
@@ -202,6 +202,7 @@ export type WorkerBindingResource =
   | CloudflareQueue
   | AiGateway
   | AnalyticsEngineDataset
+  | SendEmail
   | ArtifactsBinding
   | ImagesBinding
   | Hyperdrive
@@ -780,62 +781,71 @@ export const Worker: Platform<
                     name: bindingName,
                     dataset: binding.dataset,
                   }
-                : isDurableObjectNamespaceLike(binding)
+                : isSendEmail(binding)
                   ? {
-                      type: "durable_object_namespace",
+                      type: "send_email",
                       name: bindingName,
-                      className: binding.className ?? binding.name,
+                      destinationAddress: binding.destinationAddress,
+                      allowedDestinationAddresses:
+                        binding.allowedDestinationAddresses,
+                      allowedSenderAddresses: binding.allowedSenderAddresses,
                     }
-                  : binding.Type === "Cloudflare.D1Database"
+                  : isDurableObjectNamespaceLike(binding)
                     ? {
-                        type: "d1",
-                        id: binding.databaseId,
+                        type: "durable_object_namespace",
                         name: bindingName,
+                        className: binding.className ?? binding.name,
                       }
-                    : binding.Type === "Cloudflare.R2Bucket"
+                    : binding.Type === "Cloudflare.D1Database"
                       ? {
-                          type: "r2_bucket",
+                          type: "d1",
+                          id: binding.databaseId,
                           name: bindingName,
-                          bucketName: binding.bucketName,
-                          jurisdiction: binding.jurisdiction.pipe(
-                            Output.map((jurisdiction) =>
-                              jurisdiction === "default"
-                                ? undefined
-                                : jurisdiction,
-                            ),
-                          ),
                         }
-                      : binding.Type === "Cloudflare.KVNamespace"
+                      : binding.Type === "Cloudflare.R2Bucket"
                         ? {
-                            type: "kv_namespace",
+                            type: "r2_bucket",
                             name: bindingName,
-                            namespaceId: binding.namespaceId,
+                            bucketName: binding.bucketName,
+                            jurisdiction: binding.jurisdiction.pipe(
+                              Output.map((jurisdiction) =>
+                                jurisdiction === "default"
+                                  ? undefined
+                                  : jurisdiction,
+                              ),
+                            ),
                           }
-                        : binding.Type === "Cloudflare.Queue"
+                        : binding.Type === "Cloudflare.KVNamespace"
                           ? {
-                              type: "queue",
+                              type: "kv_namespace",
                               name: bindingName,
-                              queueName: binding.queueName,
+                              namespaceId: binding.namespaceId,
                             }
-                          : binding.Type === "Cloudflare.AiGateway"
+                          : binding.Type === "Cloudflare.Queue"
                             ? {
-                                type: "ai",
+                                type: "queue",
                                 name: bindingName,
+                                queueName: binding.queueName,
                               }
-                            : binding.Type === "Cloudflare.Hyperdrive"
+                            : binding.Type === "Cloudflare.AiGateway"
                               ? {
-                                  type: "hyperdrive",
+                                  type: "ai",
                                   name: bindingName,
-                                  id: binding.hyperdriveId,
                                 }
-                              : isWorker(binding)
+                              : binding.Type === "Cloudflare.Hyperdrive"
                                 ? {
-                                    type: "service",
+                                    type: "hyperdrive",
                                     name: bindingName,
-                                    service: binding.workerName,
+                                    id: binding.hyperdriveId,
                                   }
-                                : // TODO(sam): handle others
-                                  undefined;
+                                : isWorker(binding)
+                                  ? {
+                                      type: "service",
+                                      name: bindingName,
+                                      service: binding.workerName,
+                                    }
+                                  : // TODO(sam): handle others
+                                    undefined;
 
         if (bindingMeta) {
           yield* resource.bind`${bindingName}`({
@@ -1088,7 +1098,7 @@ export const bindWorker = Effect.fnUntraced(function* <Shape, Req = never>(
   // cold-start). `WorkerEnvironment` only exists at exec phase on the
   // deployed worker, so we hand `makeRpcStub` an `Effect<stub>` that
   // resolves the binding lazily on each method call.
-  const stubEff = WorkerEnvironment.asEffect().pipe(
+  const stubEff = WorkerEnvironment.pipe(
     Effect.map((env) => (env as Record<string, unknown>)[worker.LogicalId]),
   );
   return makeRpcStub<Shape>(stubEff);
@@ -1608,6 +1618,22 @@ export const LiveWorkerProvider = () =>
           const builder = await vite.createBuilder(
             {
               root: props.vite?.rootDir,
+              // Emulate `vite build` env semantics for `props.env`: only
+              // keys with Vite's default `VITE_` prefix are inlined into
+              // the bundle as `import.meta.env.*`. `Redacted` values are
+              // unwrapped — by prefixing with `VITE_` the user is opting
+              // them into the public bundle.
+              define: Object.fromEntries(
+                Object.entries(props.env ?? {}).flatMap(([key, raw]) => {
+                  if (!key.startsWith("VITE_")) return [];
+                  const value = Redacted.isRedacted(raw)
+                    ? Redacted.value(raw)
+                    : raw;
+                  return [
+                    [`import.meta.env.${key}`, JSON.stringify(value)] as const,
+                  ];
+                }),
+              ),
               // Declare the ssr environment so Vite 8+ creates it.
               // The cloudflare-vite-plugin config hook merges its
               // SSR-specific settings on top of this stub.
@@ -2363,7 +2389,23 @@ export const LiveWorkerProvider = () =>
                   type: "application/javascript+module",
                 }),
               ],
-            });
+            }).pipe(
+              // Cloudflare's PUT /workers/scripts/{name} intermittently
+              // returns code 10002 / "An unknown error has occurred" on the
+              // first put for a fresh worker name. Surfaced as the shared
+              // `InternalServerError` upstream (alchemy-run/distilled#290).
+              // Also match `UnknownCloudflareError` for older
+              // @distilled.cloud/cloudflare versions that haven't picked
+              // up the patch yet.
+              Effect.retry({
+                while: (e: any) =>
+                  e._tag === "InternalServerError" ||
+                  e._tag === "UnknownCloudflareError",
+                schedule: Schedule.exponential(1000).pipe(
+                  Schedule.both(Schedule.recurs(5)),
+                ),
+              }),
+            );
             if (doClasses.length > 0) {
               ({ durableObjectNamespaces } =
                 yield* getWorkerSettingsWithDurableObjects(name, doClasses));

package/src/Cloudflare/Workers/WorkerBundle.ts

@@ -163,14 +163,12 @@ import { MinimumLogLevel } from "effect/References";
 import { NodeServices } from "@effect/platform-node";
 import { Stack } from "alchemy/Stack";
 import { WorkerEnvironment, makeDurableObjectBridge, makeWorkerBridge${hasWfClasses ? ", makeWorkflowBridge" : ""}, ExportedHandlerMethods } from "alchemy/Cloudflare";
+import { makeEntrypointLayer } from "alchemy/Runtime";
 
-import entry from "${importPath}";
+import entrypoint from "${importPath}";
 
 const tag = Context.Service("${Self.key}")
-const layer =
-  typeof entry?.build === "function"
-    ? entry
-    : Layer.effect(tag, typeof entry?.asEffect === "function" ? entry.asEffect() : entry);
+const layer = makeEntrypointLayer(tag, entrypoint);
 
 const platform = Layer.mergeAll(
   NodeServices.layer,
@@ -189,7 +187,7 @@ const stack = Layer.succeed(
   }
 );
 
-const exportsEffect = tag.asEffect().pipe(
+const exportsEffect = tag.pipe(
   Effect.flatMap(func => func.RuntimeContext.exports),
   Effect.provide(
     layer.pipe(

package/src/Cloudflare/Workers/Workflow.ts

@@ -73,7 +73,7 @@ export const sleep = (
   name: string,
   duration: string | number,
 ): Effect.Effect<void, never, WorkflowStep> =>
-  WorkflowStep.asEffect().pipe(
+  WorkflowStep.pipe(
     Effect.flatMap((step) => step.sleep(name, duration)),
     Effect.orDie,
   );
@@ -85,7 +85,7 @@ export const sleepUntil = (
   name: string,
   timestamp: Date | number,
 ): Effect.Effect<void, never, WorkflowStep> =>
-  WorkflowStep.asEffect().pipe(
+  WorkflowStep.pipe(
     Effect.flatMap((step) => step.sleepUntil(name, timestamp)),
     Effect.orDie,
   );

package/src/Cloudflare/index.ts

@@ -6,6 +6,7 @@ export * from "./CloudflareEnvironment.ts";
 export * from "./Container/index.ts";
 export * from "./D1/index.ts";
 export * from "./EdgeSession.ts";
+export * from "./Email/index.ts";
 export * from "./Hyperdrive/index.ts";
 export * from "./Images/index.ts";
 export * from "./KV/index.ts";

package/src/Construct.ts

@@ -49,11 +49,7 @@ import * as Namespace from "./Namespace.ts";
  * ```
  */
 export const fn: {
-  <
-    Eff extends Effect.Yieldable<any, any, any, any>,
-    AEff,
-    Props extends object,
-  >(
+  <Eff extends Effect.Effect<any, any, any>, AEff, Props extends object>(
     body: (id: string, props: Props) => Generator<Eff, AEff, never>,
   ): (
     id: string,
@@ -62,12 +58,12 @@ export const fn: {
     AEff,
     [Eff] extends [never]
       ? never
-      : [Eff] extends [Effect.Yieldable<infer _S, infer _A, infer E, infer _R>]
+      : [Eff] extends [Effect.Effect<infer _A, infer E, infer _R>]
         ? E
         : never,
     [Eff] extends [never]
       ? never
-      : [Eff] extends [Effect.Yieldable<infer _S, infer _A, infer _E, infer R>]
+      : [Eff] extends [Effect.Effect<infer _A, infer _E, infer R>]
         ? R
         : never
   >;

package/src/Destroy.ts

@@ -28,6 +28,7 @@ export const destroy = ({
         // TODO(sam): probably better to have Plan.destroy and Plan.update
         resources: {},
         bindings: {},
+        actions: {},
         output: {},
       }).pipe(Effect.flatMap(Apply.apply)),
     { stage, dev, scope },

package/src/Http.ts

@@ -80,7 +80,7 @@ export const safeHttpEffect = <Req = never>(
 export const resolvePort = (options: { port?: number } | undefined) =>
   options?.port !== undefined
     ? Effect.succeed(options.port)
-    : Config.number("PORT").pipe(Config.withDefault(3000)).asEffect();
+    : Config.number("PORT").pipe(Config.withDefault(3000));
 
 export const BunHttpServer = () =>
   Layer.effect(