effect-cf 0.52.0 → 0.54.0

package/dist/RateLimit.mjs

@@ -0,0 +1,46 @@
+import { __exportAll } from "./_virtual/_rolldown/runtime.mjs";
+import { layer as layer$1 } from "./Binding.mjs";
+import * as Context from "effect/Context";
+import * as Data from "effect/Data";
+import * as Effect from "effect/Effect";
+import * as Predicate from "effect/Predicate";
+//#region src/RateLimit.ts
+var RateLimit_exports = /* @__PURE__ */ __exportAll({
+	RateLimitOperationError: () => RateLimitOperationError,
+	Tag: () => Tag,
+	isRateLimit: () => isRateLimit,
+	layer: () => layer,
+	make: () => make,
+	makeClient: () => makeClient
+});
+const expectedRateLimit = "Rate Limiting binding with limit()";
+var RateLimitOperationError = class extends Data.TaggedError("RateLimitOperationError") {
+	get message() {
+		return `Cloudflare rate limit binding "${this.binding}" operation "limit" failed`;
+	}
+};
+const isRateLimit = (value) => Predicate.hasProperty(value, "limit") && Predicate.isFunction(value.limit);
+const makeClient = (definition) => (rateLimit) => ({
+	definition,
+	limit: (options) => Effect.tryPromise({
+		try: () => rateLimit.limit(options),
+		catch: (cause) => new RateLimitOperationError({
+			binding: definition.binding,
+			operation: "limit",
+			cause
+		})
+	}),
+	rawUnsafe: Effect.succeed(rateLimit)
+});
+const layer = (tag, definition) => layer$1(tag, definition.binding, isRateLimit, makeClient(definition), { expected: expectedRateLimit });
+const make = (id) => Tag()(id);
+const Tag = () => (id) => {
+	const tag = Context.Service()(id);
+	const makeLayer = (definition) => layer(tag, definition);
+	return Object.assign(tag, {
+		id,
+		layer: makeLayer
+	});
+};
+//#endregion
+export { RateLimitOperationError, RateLimit_exports, Tag, isRateLimit, layer, make, makeClient };

package/dist/RpcWebSocketClient.d.mts

@@ -1,11 +1,11 @@
 import * as Context from "effect/Context";
 import * as Layer from "effect/Layer";
-import * as RpcSerialization from "effect/unstable/rpc/RpcSerialization";
-import * as RpcClient from "effect/unstable/rpc/RpcClient";
-import * as Socket from "effect/unstable/socket/Socket";
-import * as Rpc from "effect/unstable/rpc/Rpc";
-import { RpcClientError } from "effect/unstable/rpc/RpcClientError";
-import * as RpcGroup from "effect/unstable/rpc/RpcGroup";
+import * as RpcSerialization from "effect/rpc/RpcSerialization";
+import * as RpcClient from "effect/rpc/RpcClient";
+import * as Socket from "effect/socket/Socket";
+import * as Rpc from "effect/rpc/Rpc";
+import { RpcClientError } from "effect/rpc/RpcClientError";
+import * as RpcGroup from "effect/rpc/RpcGroup";
 declare namespace RpcWebSocketClient_d_exports {
   export { LayerOptions, layer };
 }

package/dist/RpcWebSocketClient.mjs

@@ -1,8 +1,8 @@
 import { __exportAll } from "./_virtual/_rolldown/runtime.mjs";
 import * as Layer from "effect/Layer";
-import * as RpcSerialization from "effect/unstable/rpc/RpcSerialization";
-import * as RpcClient from "effect/unstable/rpc/RpcClient";
-import * as Socket from "effect/unstable/socket/Socket";
+import * as RpcSerialization from "effect/rpc/RpcSerialization";
+import * as RpcClient from "effect/rpc/RpcClient";
+import * as Socket from "effect/socket/Socket";
 //#region src/RpcWebSocketClient.ts
 var RpcWebSocketClient_exports = /* @__PURE__ */ __exportAll({ layer: () => layer });
 /**

package/dist/Worker.d.mts

@@ -10,8 +10,8 @@ import * as Context$1 from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer$1 from "effect/Layer";
 import { WorkerEntrypoint } from "cloudflare:workers";
-import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
-import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse";
+import * as HttpServerRequest from "effect/http/HttpServerRequest";
+import * as HttpServerResponse from "effect/http/HttpServerResponse";
 import { Cause, Scope } from "effect";
 declare namespace Worker_d_exports {
   export { Api, BindingNotFoundError, BindingValidationError, Definition, ExecutionContext, FetchHandler, FetchWorkerOptions, HandlerEffect, Handlers, LayerOptions, Method, Methods, NativeRequest, NativeSchema, NoReservedMethods, Options, ReservedMethodName, RpcHandlers, RpcSchema, RunOptions, RunSymbol, ServerApi, ServiceBindingFetchError, ServiceBindingRpcError, ServiceCall, ServiceFreeSchema, ServiceRpc, ServiceScopedCall, Tag, TagClass, WorkerClass, WorkerContext, WorkerContextService, WorkerContextWaitUntilOptions, WorkerFetchSuccess, WorkerHandler, WorkerOptions, WorkerRpc, WorkerRpcContract, WorkerRpcHandler, WorkerRpcContract as WorkerRpcShape, implement, isWebSocketUpgrade, make, makeFetchHandler, method, native };

package/dist/Worker.mjs

@@ -13,10 +13,10 @@ import * as Layer from "effect/Layer";
 import { WorkerEntrypoint } from "cloudflare:workers";
 import * as Tracer from "effect/Tracer";
 import * as References from "effect/References";
-import * as HttpEffect from "effect/unstable/http/HttpEffect";
-import * as HttpMiddleware from "effect/unstable/http/HttpMiddleware";
-import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
-import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse";
+import * as HttpEffect from "effect/http/HttpEffect";
+import * as HttpMiddleware from "effect/http/HttpMiddleware";
+import * as HttpServerRequest from "effect/http/HttpServerRequest";
+import * as HttpServerResponse from "effect/http/HttpServerResponse";
 //#region src/Worker.ts
 var Worker_exports = /* @__PURE__ */ __exportAll({
 	ExecutionContext: () => ExecutionContext,

package/dist/index.d.mts

@@ -36,10 +36,11 @@ import { DurableObjectSqlite_d_exports } from "./DurableObjectSqlite.mjs";
 import { Email_d_exports } from "./Email.mjs";
 import { Images_d_exports } from "./Images.mjs";
 import { Kv_d_exports } from "./Kv.mjs";
+import { RateLimit_d_exports } from "./RateLimit.mjs";
 import { R2_d_exports } from "./R2.mjs";
 import { RpcTargets_d_exports } from "./RpcTargets.mjs";
 import { Vectorize_d_exports } from "./Vectorize.mjs";
 import { WebTransport_d_exports } from "./WebTransport.mjs";
 import { WorkflowDefinition_d_exports } from "./WorkflowDefinition.mjs";
 import { Workflow_d_exports } from "./Workflow.mjs";
-export { AiGateway_d_exports as AiGateway, AnalyticsEngine_d_exports as AnalyticsEngine, Artifacts_d_exports as Artifacts, Binding_d_exports as Binding, BrowserRendering_d_exports as BrowserRendering, Cache_d_exports as Cache, CloudflareOtlp_d_exports as CloudflareOtlp, CloudflareTracer_d_exports as CloudflareTracer, ContainerFiles_d_exports as ContainerFiles, ContainerNamespace_d_exports as ContainerNamespace, D1_d_exports as D1, DurableObject_d_exports as DurableObject, DurableObjectAlarm_d_exports as DurableObjectAlarm, DurableObjectContainer_d_exports as DurableObjectContainer, DurableObjectDefinition_d_exports as DurableObjectDefinition, DurableObjectNamespace_d_exports as DurableObjectNamespace, DurableObjectRpcWebSocket_d_exports as DurableObjectRpcWebSocket, DurableObjectSqlite_d_exports as DurableObjectSqlite, DurableObjectState_d_exports as DurableObjectState, DurableObjectStorage_d_exports as DurableObjectStorage, DurableObjectWebSocket_d_exports as DurableObjectWebSocket, Email_d_exports as Email, Environment_d_exports as Environment, Hyperdrive_d_exports as Hyperdrive, Images_d_exports as Images, Kv_d_exports as Kv, Queue_d_exports as Queue, QueueBinding_d_exports as QueueBinding, QueueDefinition_d_exports as QueueDefinition, R2_d_exports as R2, Rpc_d_exports as Rpc, RpcDefinition_d_exports as RpcDefinition, RpcTargets_d_exports as RpcTargets, RpcTracing_d_exports as RpcTracing, RpcWebSocketClient_d_exports as RpcWebSocketClient, ServiceBinding_d_exports as ServiceBinding, Vectorize_d_exports as Vectorize, WebTransport_d_exports as WebTransport, Worker_d_exports as Worker, WorkerConfig, WorkerDefinition_d_exports as WorkerDefinition, type WorkerEnv, WorkerEnvironment, WorkersAi_d_exports as WorkersAi, Workflow_d_exports as Workflow, WorkflowBinding_d_exports as WorkflowBinding, WorkflowDefinition_d_exports as WorkflowDefinition };
+export { AiGateway_d_exports as AiGateway, AnalyticsEngine_d_exports as AnalyticsEngine, Artifacts_d_exports as Artifacts, Binding_d_exports as Binding, BrowserRendering_d_exports as BrowserRendering, Cache_d_exports as Cache, CloudflareOtlp_d_exports as CloudflareOtlp, CloudflareTracer_d_exports as CloudflareTracer, ContainerFiles_d_exports as ContainerFiles, ContainerNamespace_d_exports as ContainerNamespace, D1_d_exports as D1, DurableObject_d_exports as DurableObject, DurableObjectAlarm_d_exports as DurableObjectAlarm, DurableObjectContainer_d_exports as DurableObjectContainer, DurableObjectDefinition_d_exports as DurableObjectDefinition, DurableObjectNamespace_d_exports as DurableObjectNamespace, DurableObjectRpcWebSocket_d_exports as DurableObjectRpcWebSocket, DurableObjectSqlite_d_exports as DurableObjectSqlite, DurableObjectState_d_exports as DurableObjectState, DurableObjectStorage_d_exports as DurableObjectStorage, DurableObjectWebSocket_d_exports as DurableObjectWebSocket, Email_d_exports as Email, Environment_d_exports as Environment, Hyperdrive_d_exports as Hyperdrive, Images_d_exports as Images, Kv_d_exports as Kv, Queue_d_exports as Queue, QueueBinding_d_exports as QueueBinding, QueueDefinition_d_exports as QueueDefinition, R2_d_exports as R2, RateLimit_d_exports as RateLimit, Rpc_d_exports as Rpc, RpcDefinition_d_exports as RpcDefinition, RpcTargets_d_exports as RpcTargets, RpcTracing_d_exports as RpcTracing, RpcWebSocketClient_d_exports as RpcWebSocketClient, ServiceBinding_d_exports as ServiceBinding, Vectorize_d_exports as Vectorize, WebTransport_d_exports as WebTransport, Worker_d_exports as Worker, WorkerConfig, WorkerDefinition_d_exports as WorkerDefinition, type WorkerEnv, WorkerEnvironment, WorkersAi_d_exports as WorkersAi, Workflow_d_exports as Workflow, WorkflowBinding_d_exports as WorkflowBinding, WorkflowDefinition_d_exports as WorkflowDefinition };

package/dist/index.mjs

@@ -35,6 +35,7 @@ import { Email_exports } from "./Email.mjs";
 import { Hyperdrive_exports } from "./Hyperdrive.mjs";
 import { Images_exports } from "./Images.mjs";
 import { Kv_exports } from "./Kv.mjs";
+import { RateLimit_exports } from "./RateLimit.mjs";
 import { R2_exports } from "./R2.mjs";
 import { RpcWebSocketClient_exports } from "./RpcWebSocketClient.mjs";
 import { Vectorize_exports } from "./Vectorize.mjs";
@@ -42,4 +43,4 @@ import { WebTransport_exports } from "./WebTransport.mjs";
 import { WorkflowBinding_exports } from "./WorkflowBinding.mjs";
 import { WorkflowDefinition_exports } from "./WorkflowDefinition.mjs";
 import { Workflow_exports } from "./Workflow.mjs";
-export { AiGateway_exports as AiGateway, AnalyticsEngine_exports as AnalyticsEngine, Artifacts_exports as Artifacts, Binding_exports as Binding, BrowserRendering_exports as BrowserRendering, Cache_exports as Cache, CloudflareOtlp_exports as CloudflareOtlp, CloudflareTracer_exports as CloudflareTracer, ContainerFiles_exports as ContainerFiles, ContainerNamespace_exports as ContainerNamespace, D1_exports as D1, DurableObject_exports as DurableObject, DurableObjectAlarm_exports as DurableObjectAlarm, DurableObjectContainer_exports as DurableObjectContainer, DurableObjectDefinition_exports as DurableObjectDefinition, DurableObjectNamespace_exports as DurableObjectNamespace, DurableObjectRpcWebSocket_exports as DurableObjectRpcWebSocket, DurableObjectSqlite_exports as DurableObjectSqlite, DurableObjectState_exports as DurableObjectState, DurableObjectStorage_exports as DurableObjectStorage, DurableObjectWebSocket_exports as DurableObjectWebSocket, Email_exports as Email, Environment_exports as Environment, Hyperdrive_exports as Hyperdrive, Images_exports as Images, Kv_exports as Kv, Queue_exports as Queue, QueueBinding_exports as QueueBinding, QueueDefinition_exports as QueueDefinition, R2_exports as R2, Rpc_exports as Rpc, RpcDefinition_exports as RpcDefinition, RpcTargets_exports as RpcTargets, RpcTracing_exports as RpcTracing, RpcWebSocketClient_exports as RpcWebSocketClient, ServiceBinding_exports as ServiceBinding, Vectorize_exports as Vectorize, WebTransport_exports as WebTransport, Worker_exports as Worker, WorkerConfig, WorkerDefinition_exports as WorkerDefinition, WorkerEnvironment, WorkersAi_exports as WorkersAi, Workflow_exports as Workflow, WorkflowBinding_exports as WorkflowBinding, WorkflowDefinition_exports as WorkflowDefinition };
+export { AiGateway_exports as AiGateway, AnalyticsEngine_exports as AnalyticsEngine, Artifacts_exports as Artifacts, Binding_exports as Binding, BrowserRendering_exports as BrowserRendering, Cache_exports as Cache, CloudflareOtlp_exports as CloudflareOtlp, CloudflareTracer_exports as CloudflareTracer, ContainerFiles_exports as ContainerFiles, ContainerNamespace_exports as ContainerNamespace, D1_exports as D1, DurableObject_exports as DurableObject, DurableObjectAlarm_exports as DurableObjectAlarm, DurableObjectContainer_exports as DurableObjectContainer, DurableObjectDefinition_exports as DurableObjectDefinition, DurableObjectNamespace_exports as DurableObjectNamespace, DurableObjectRpcWebSocket_exports as DurableObjectRpcWebSocket, DurableObjectSqlite_exports as DurableObjectSqlite, DurableObjectState_exports as DurableObjectState, DurableObjectStorage_exports as DurableObjectStorage, DurableObjectWebSocket_exports as DurableObjectWebSocket, Email_exports as Email, Environment_exports as Environment, Hyperdrive_exports as Hyperdrive, Images_exports as Images, Kv_exports as Kv, Queue_exports as Queue, QueueBinding_exports as QueueBinding, QueueDefinition_exports as QueueDefinition, R2_exports as R2, RateLimit_exports as RateLimit, Rpc_exports as Rpc, RpcDefinition_exports as RpcDefinition, RpcTargets_exports as RpcTargets, RpcTracing_exports as RpcTracing, RpcWebSocketClient_exports as RpcWebSocketClient, ServiceBinding_exports as ServiceBinding, Vectorize_exports as Vectorize, WebTransport_exports as WebTransport, Worker_exports as Worker, WorkerConfig, WorkerDefinition_exports as WorkerDefinition, WorkerEnvironment, WorkersAi_exports as WorkersAi, Workflow_exports as Workflow, WorkflowBinding_exports as WorkflowBinding, WorkflowDefinition_exports as WorkflowDefinition };

package/dist/internal/Runtime.mjs

@@ -31,14 +31,16 @@ const makeEntrypointRuntime = (layer, env, services) => {
 	const entrypointServices = Layer.mergeAll(services, ConfigProvider.layer(WorkerConfig.providerFromEnv(env)), Layer.succeed(WorkerEnvironment, env));
 	return ManagedRuntime.make(provideEntrypointServices(layer, entrypointServices));
 };
+/** Close event resources before an outer lifecycle (such as alarm reconciliation) completes. */
+const scopeEvent = (effect) => Effect.scoped(withScope(effect));
 function runEventPromise(...args) {
 	const [runtime, effect, eventLayer, parent, onFailure] = args;
 	if (eventLayer === void 0) {
-		const event = Effect.scoped(withScope(effect));
+		const event = scopeEvent(effect);
 		return runPromise(runtime, parent === void 0 ? event : Effect.withParentSpan(event, parent), onFailure);
 	}
-	const event = Effect.scoped(withScope(effect.pipe(Effect.provide(eventLayer, { local: true }))));
+	const event = scopeEvent(effect.pipe(Effect.provide(eventLayer, { local: true })));
 	return runPromise(runtime, parent === void 0 ? event : Effect.withParentSpan(event, parent), onFailure);
 }
 //#endregion
-export { makeEntrypointRuntime, runEventPromise };
+export { makeEntrypointRuntime, runEventPromise, scopeEvent };

package/dist/internal/Telemetry.mjs

@@ -1,6 +1,6 @@
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
-import { Flusher } from "effect/unstable/observability/OtlpExporter";
+import { Flusher } from "effect/observability/OtlpExporter";
 //#region src/internal/Telemetry.ts
 /** Maximum event lifetime spent on an internally scheduled telemetry flush. */
 const scheduledFlushTimeout = "2 seconds";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-cf",
-  "version": "0.52.0",
+  "version": "0.54.0",
   "description": "Effect-native primitives for Cloudflare Workers and bindings.",
   "license": "MIT",
   "repository": {
@@ -100,11 +100,11 @@
     "@cloudflare/sandbox": "^0.13.0-next.738.2 || ^1.0.0",
     "@cloudflare/vitest-plugin": "^1.0.0",
     "@cloudflare/workers-types": "^5.20260926.1",
-    "@effect/sql-d1": "^4.0.0-rc.115",
-    "@effect/sql-pg": "^4.0.0-rc.115",
-    "@effect/sql-sqlite-do": "^4.0.0-rc.115",
+    "@effect/sql-d1": "^4.0.0",
+    "@effect/sql-pg": "^4.0.0",
+    "@effect/sql-sqlite-do": "^4.0.0",
     "@modelcontextprotocol/server": "^2.0.0",
-    "effect": "^4.0.0-rc.115"
+    "effect": "^4.0.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/computer": {

package/src/AnalyticsEngine.ts

@@ -8,10 +8,10 @@ import * as Predicate from "effect/Predicate";
 import * as Result from "effect/Result";
 import * as S from "effect/Schema";
 import type { Redacted } from "effect";
-import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
-import * as HttpClient from "effect/unstable/http/HttpClient";
-import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest";
-import type { Headers, HttpClientResponse } from "effect/unstable/http";
+import * as FetchHttpClient from "effect/http/FetchHttpClient";
+import * as HttpClient from "effect/http/HttpClient";
+import * as HttpClientRequest from "effect/http/HttpClientRequest";
+import type { Headers, HttpClientResponse } from "effect/http";
 
 import * as Binding from "./Binding";
 import type { WorkerEnvironment } from "./Environment";

package/src/CloudflareOtlp.ts

@@ -9,14 +9,14 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import type * as Tracer from "effect/Tracer";
-import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
-import type { Headers } from "effect/unstable/http";
-import * as OtlpExporter from "effect/unstable/observability/OtlpExporter";
-import * as OtlpLogger from "effect/unstable/observability/OtlpLogger";
-import * as OtlpMetrics from "effect/unstable/observability/OtlpMetrics";
-import * as OtlpResource from "effect/unstable/observability/OtlpResource";
-import * as OtlpSerialization from "effect/unstable/observability/OtlpSerialization";
-import * as OtlpTracer from "effect/unstable/observability/OtlpTracer";
+import * as FetchHttpClient from "effect/http/FetchHttpClient";
+import type { Headers } from "effect/http";
+import * as OtlpExporter from "effect/observability/OtlpExporter";
+import * as OtlpLogger from "effect/observability/OtlpLogger";
+import * as OtlpMetrics from "effect/observability/OtlpMetrics";
+import * as OtlpResource from "effect/observability/OtlpResource";
+import * as OtlpSerialization from "effect/observability/OtlpSerialization";
+import * as OtlpTracer from "effect/observability/OtlpTracer";
 
 import { DurableObjectState } from "./DurableObjectState";
 import { WorkerConfig, WorkerEnvironment } from "./Environment";

package/src/D1.ts

@@ -3,7 +3,7 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Predicate from "effect/Predicate";
 import type { Config } from "effect";
-import type { SqlClient } from "effect/unstable/sql";
+import type { SqlClient } from "effect/sql";
 
 import * as Binding from "./Binding";
 import type { WorkerEnvironment } from "./Environment";

package/src/DurableObject.ts

@@ -10,8 +10,14 @@ import { WorkerEnvironment, type WorkerEnv } from "./Environment";
 import { DurableObjectState, fromDurableObjectState } from "./DurableObjectState";
 import {
   DurableObjectAlarm,
+  DispatchAfterEvent,
+  HasDueAlarms,
+  RunAlarm,
+  dispatchRawAlarm,
   type AlarmRegistration,
   type AlarmService,
+  type InvalidAlarmRegistrationError,
+  type InvalidScheduleConfigurationError,
 } from "./DurableObjectAlarm";
 import { fromWebSocket, type DurableWebSocket } from "./DurableObjectWebSocket";
 import * as RpcDefinition from "./RpcDefinition";
@@ -229,6 +235,7 @@ export type DurableObjectClass<Rpc extends DurableObjectRpc<ROut>, ROut> = new (
   env: WorkerEnv,
 ) => CloudflareDurableObject<WorkerEnv> &
   DurableObjectRpcApi<Rpc, ROut> & {
+    alarm(alarmInfo?: globalThis.AlarmInvocationInfo): Promise<void> | void;
     [RunSymbol]<A, E>(
       effect: Effect.Effect<A, E, HandlerContext<ROut>>,
       options?: RunOptions,
@@ -274,12 +281,15 @@ export function make<
 ): DurableObjectClass<Rpc, ROut | REvent | RAlarm> {
   const registration =
     options.alarms !== undefined && !Effect.isEffect(options.alarms) ? options.alarms : undefined;
-  const logicalAlarms = (
-    registration?.run ?? (Effect.isEffect(options.alarms) ? options.alarms : undefined)
-  )?.pipe(Effect.asVoid);
+  const legacyAlarms = Effect.isEffect(options.alarms)
+    ? options.alarms.pipe(Effect.asVoid)
+    : undefined;
 
   class EffectDurableObject extends CloudflareDurableObject<WorkerEnv> {
-    readonly runtime: ManagedRuntime.ManagedRuntime<RuntimeContext<ROut | RAlarm>, LayerError>;
+    readonly runtime: ManagedRuntime.ManagedRuntime<
+      RuntimeContext<ROut | RAlarm>,
+      LayerError | InvalidAlarmRegistrationError
+    >;
 
     constructor(state: globalThis.DurableObjectState, env: WorkerEnv) {
       super(state, env);
@@ -290,12 +300,16 @@ export function make<
       // SAFETY: RAlarm is inferred only from the registration's layer; without a registration it is never.
       const services = (registration?.layer ?? Layer.empty).pipe(
         Layer.provideMerge(baseServices),
-      ) as Layer.Layer<DurableObjectState | DurableObjectAlarm | RAlarm>;
+      ) as Layer.Layer<
+        DurableObjectState | DurableObjectAlarm | RAlarm,
+        InvalidAlarmRegistrationError
+      >;
 
       this.runtime = Runtime.makeEntrypointRuntime<
         ROut,
         LayerError,
-        DurableObjectState | DurableObjectAlarm | RAlarm
+        DurableObjectState | DurableObjectAlarm | RAlarm,
+        InvalidAlarmRegistrationError
       >(layer, env, services);
 
       const initialize = options.initialize;
@@ -322,27 +336,54 @@ export function make<
       const eventLayer = runOptions.eventLayer === false ? undefined : options.eventLayer;
       const parent = runOptions.rpc?.parent;
       const parentSpan = parent === undefined ? undefined : Tracer.externalSpan(parent);
+      const afterResponse = runOptions.event === "rpc" || runOptions.event === "fetch";
+      let dispatchAfterEvent = false;
+      const handler = afterResponse
+        ? effect.pipe(
+            Effect.onExit(() =>
+              Effect.flatMap(DurableObjectAlarm, (alarms) =>
+                Effect.map(alarms[DispatchAfterEvent], (enabled) => {
+                  dispatchAfterEvent = enabled;
+                }),
+              ),
+            ),
+          )
+        : effect;
+      let response: Promise<A>;
 
       if (eventLayer === undefined) {
         // SAFETY: initialize cannot require event services; without an event layer, all requirements are already provided.
-        return Runtime.runEventPromise(
+        response = Runtime.runEventPromise(
           this.runtime,
           // @effect-diagnostics-next-line unsafeEffectTypeAssertion:off
-          effect as Effect.Effect<A, E, HandlerContext<ROut | RAlarm>>,
+          handler as Effect.Effect<A, E, HandlerContext<ROut | RAlarm>>,
           undefined,
           parentSpan,
           runOptions.onFailure,
         );
+      } else {
+        response = Runtime.runEventPromise<
+          A,
+          E,
+          RuntimeContext<ROut | RAlarm>,
+          REvent,
+          EventLayerError,
+          LayerError | InvalidAlarmRegistrationError
+        >(this.runtime, handler, eventLayer, parentSpan, runOptions.onFailure);
       }
 
-      return Runtime.runEventPromise<
-        A,
-        E,
-        RuntimeContext<ROut | RAlarm>,
-        REvent,
-        EventLayerError,
-        LayerError
-      >(this.runtime, effect, eventLayer, parentSpan, runOptions.onFailure);
+      if (!afterResponse) return response;
+
+      return response.finally(() => {
+        if (dispatchAfterEvent) {
+          this.ctx.waitUntil(
+            // The default scheduler yields to a later task, after the response chain unwinds.
+            Effect.runPromise(
+              Effect.yieldNow.pipe(Effect.andThen(Effect.promise(() => this.#runAlarm(false)))),
+            ),
+          );
+        }
+      });
     }
 
     fetch(request: Request): Promise<Response> {
@@ -357,21 +398,43 @@ export function make<
       });
     }
 
-    alarm(alarmInfo?: globalThis.AlarmInvocationInfo): Promise<void> | void {
-      const rawAlarm = options.alarm?.(alarmInfo);
-      const alarmEffect =
-        logicalAlarms !== undefined && rawAlarm !== undefined
-          ? Effect.gen(function* () {
-              yield* logicalAlarms;
-              yield* rawAlarm;
-            })
-          : (logicalAlarms ?? rawAlarm);
-
-      if (alarmEffect !== undefined) {
-        return this[RunSymbol](alarmEffect.pipe(Effect.onExit(() => scheduleTelemetryFlush)), {
+    alarm(alarmInfo?: globalThis.AlarmInvocationInfo): Promise<void> {
+      return this.#runAlarm(true, alarmInfo);
+    }
+
+    #runAlarm(native: boolean, alarmInfo?: globalThis.AlarmInvocationInfo): Promise<void> {
+      const event = (beginDispatch: Effect.Effect<void, InvalidScheduleConfigurationError>) => {
+        const alarmEffect = Effect.gen(function* () {
+          const alarms = yield* DurableObjectAlarm;
+
+          if (!native && !(yield* alarms[HasDueAlarms])) return;
+          const rawAlarm = options.alarm?.(alarmInfo);
+          const customAlarm =
+            legacyAlarms === undefined
+              ? (rawAlarm ?? Effect.void)
+              : legacyAlarms.pipe(Effect.andThen(rawAlarm ?? Effect.void));
+
+          yield* beginDispatch;
+          // Custom dispatchers, including Effect-form alarms, recover retained checkpoints.
+          yield* registration === undefined || rawAlarm !== undefined
+            ? dispatchRawAlarm(customAlarm, registration)
+            : registration.run.pipe(Effect.asVoid);
+        }).pipe(Effect.onExit(() => scheduleTelemetryFlush));
+
+        return Runtime.scopeEvent(
+          options.eventLayer === undefined
+            ? alarmEffect
+            : alarmEffect.pipe(Effect.provide(options.eventLayer, { local: true })),
+        );
+      };
+
+      return this[RunSymbol](
+        Effect.flatMap(DurableObjectAlarm, (alarms) => alarms[RunAlarm](event, native)),
+        {
           event: "alarm",
-        });
-      }
+          eventLayer: false,
+        },
+      );
     }
 
     webSocketMessage(socket: WebSocket, message: string | ArrayBuffer): Promise<void> | void {