@effect-agent/platform-cloudflare 0.1.0-beta.112 → 0.1.0-beta.113

package/dist/Alarm.d.mts

@@ -10,7 +10,7 @@ import { ThreadProjectionError, ThreadProjectionMaintenance } from "effect-agent
 import { WakeScheduler } from "effect-agent/wake-scheduler";
 import { SqlClient } from "effect/unstable/sql/SqlClient";
 declare namespace Alarm_d_exports {
-  export { DurableAlarmError, DurableAlarmService, MaintenancePassFailure, MaintenancePassReport, ThreadHostMaintenance, ThreadMaintenance, ThreadMaintenanceFailpoint, ThreadMaintenanceFailpointHandler, ThreadMaintenanceFailpointLocation, ThreadMessageDelivery, ThreadMutationGate, ThreadPublication, ThreadPublicationService, ThreadRecoveryFault, publishCommitted };
+  export { DurableAlarmError, DurableAlarmService, MaintenancePassFailure, MaintenancePassReport, ThreadHostMaintenance, ThreadMaintenance, ThreadMaintenanceActivity, ThreadMaintenanceFailpoint, ThreadMaintenanceFailpointHandler, ThreadMaintenanceFailpointLocation, ThreadMessageDelivery, ThreadMutationGate, ThreadPublication, ThreadPublicationService, ThreadRecoveryFault, publishCommitted };
 }
 declare const DurableAlarmError_base: Schema.Class<DurableAlarmError, Schema.TaggedStruct<"DurableAlarmError", {
   readonly operation: Schema.String;
@@ -114,25 +114,49 @@ declare const ThreadPublication_base: Context.ServiceClass<ThreadPublication, "@
 export declare class ThreadPublication extends ThreadPublication_base {
   static readonly layer: Layer.Layer<ThreadPublication, never, never>;
 }
+declare const ThreadMaintenanceActivity_base: Context.ServiceClass<ThreadMaintenanceActivity, "@effect-agent/platform-cloudflare/ThreadMaintenanceActivity", {
+  /**
+   * Account for one finite selection/dispatch, through joined completion or interruption.
+   * Register before reading/claiming work. After dispatch closes the body is not started.
+   * Host waves retain their declared allowance from this call; message Claims keep the driver's
+   * own deadline. Waiting for notifications belongs outside this bracket.
+   */
+  readonly run: <R>(wave: Effect.Effect<void, DurableAlarmError, R>) => Effect.Effect<void, DurableAlarmError, R>;
+  /** Acknowledge all initial subscriptions/scans. Composite hosts use `all` below. */
+  readonly ready: Effect.Effect<void>;
+  /**
+   * Acquire an independent scoped subscription before the initial scan and `ready`.
+   * The returned wait observes coalesced native scan hints, including those published before
+   * its first execution. Each hint requests a current local due-work check.
+   */
+  readonly subscribeChanges: Effect.Effect<Effect.Effect<void>, never, Scope.Scope>;
+}>;
+/** Event-local accounting shared by the existing maintenance pumps and native scheduler. */
+export declare class ThreadMaintenanceActivity extends ThreadMaintenanceActivity_base {
+  /** Join child pumps; acknowledge the parent only after every child is ready or has exited. */
+  static readonly all: <A, E, R>(lanes: readonly Effect.Effect<A, E, R>[]) => Effect.Effect<readonly A[], E, R | ThreadMaintenanceActivity>;
+}
 /**
  * Host-assembled native message recovery. The driver bounds each actual Claim and persists its
  * timeout/retry before this pump returns. Do not add a second timer starting at batch selection:
  * local Claim setup may take time, and expiration still owes the driver's local retry commit.
  */
 export declare const ThreadMessageDelivery: Context.Reference<{
-  readonly drainUntil: (dispatchClosed: Effect.Effect<void>, dispatchUntil: DateTime.Utc) => Effect.Effect<void, DurableAlarmError, Scope.Scope>;
+  readonly drainUntil: (dispatchClosed: Effect.Effect<void>, dispatchUntil: DateTime.Utc) => Effect.Effect<void, DurableAlarmError, Scope.Scope | ThreadMaintenanceActivity>;
   readonly pendingDeadline: Effect.Effect<Option.Option<number>, DurableAlarmError>;
 }>;
 /**
  * Application obligations sharing this Object's alarm. Admit one initial external wave even on
- * a caught-up pass, then respond to wakes until dispatchClosed. This closes only admission
- * of NEW external waves; native work can continue while admitted waves finish. Keep local
- * admission/hub subscriptions in the event Scope until maintenance tears it down.
+ * a caught-up pass, then respond to wakes and ThreadMaintenanceActivity.subscribeChanges until
+ * dispatchClosed. Yield the event's ThreadMaintenanceActivity to bracket each finite lane with
+ * run and acknowledge initial setup with ready.
+ * Passive subscriptions do not count as active work. Closure stops both new waves and native
+ * Attempts; local admission/control subscriptions belong to the event Scope until teardown.
  * No deadline sleeps or automatic retry loops. Return after already-admitted waves finish.
  *
  * Declare a finite whole-wave allowance (1..300000ms): maximum for parallel lanes, sum for
  * sequential operations. Admit a wave only if its allowance fits before dispatchUntil. Later
- * arrivals cannot renew the retirement window. Maintenance bounds the join after dispatchClosed,
+ * arrivals cannot renew an admitted wave's allowance. Maintenance bounds each registered wave,
  * interrupts and joins event Scope, then reads local deadlines under the mutation gate.
  *
  * Setup and pendingDeadline are bounded local operations. Persist claims/envelopes before
@@ -143,7 +167,7 @@ export declare const ThreadMessageDelivery: Context.Reference<{
  */
 export declare const ThreadHostMaintenance: Context.Reference<{
   readonly dispatchTimeoutMillis: number;
-  readonly drainUntil: (dispatchClosed: Effect.Effect<void>, dispatchUntil: DateTime.Utc) => Effect.Effect<void, DurableAlarmError, Scope.Scope>;
+  readonly drainUntil: (dispatchClosed: Effect.Effect<void>, dispatchUntil: DateTime.Utc) => Effect.Effect<void, DurableAlarmError, Scope.Scope | ThreadMaintenanceActivity>;
   readonly pendingDeadline: Effect.Effect<Option.Option<number>, DurableAlarmError>;
 }>;
 /** @internal A committed source operation must not become a failed operation because delivery failed. */
@@ -217,10 +241,10 @@ declare const ThreadMaintenance_base: Context.ServiceClass<ThreadMaintenance, "@
  *    recovery, ledger scans or canonical-history reads.
  * 2. Reconcile before each head Attempt, then checkpoint only the observed generation. A racing
  *    producer keeps its newer generation dirty. Native retries retain their durable backoff.
- * 3. Keep delivery admission open while old recovery is pending, so fresh native replies can
- *    publish in this event. Close once, at latest at the original ten-minute yield deadline;
- *    native wakes can still advance heads while admitted deliveries retire.
- * 4. Native message delivery retains its driver-owned Claim deadline. Host/backfill joins are
+ * 3. Keep native and delivery admission open together while finite waves remain active, so
+ *    fresh replies and abort controls can progress during unrelated cleanup. Close atomically
+ *    at quiescence, or at the original ten-minute yield deadline, before retiring listeners.
+ * 4. Native message delivery retains its driver-owned Claim deadline. Host/backfill waves are
  *    bounded independently; incoming native work never restarts or cancels their attempts.
  *    Auxiliary failures are reported after the current native opportunity.
  * 5. Close every event resource before the final gated deadline snapshot and alarm decision.

package/dist/Alarm.mjs

@@ -2,7 +2,7 @@ import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
 import { DurableObjectContext } from "./CloudflareBindings.mjs";
 import { AuxiliaryDispatchMillis, CloudflareDurableRuntimeConfig } from "./CloudflareConfig.mjs";
 import { r as safeCauseMessage } from "./boundary-BguazVkh.mjs";
-import { Cause, Clock, Context, DateTime, Deferred, Effect, Exit, Fiber, Layer, Option, Random, Ref, Result, Schema, Scope, Semaphore, Stream, Struct } from "effect";
+import { Cause, Clock, Context, DateTime, Deferred, Effect, Exit, Fiber, Layer, Option, PubSub, Random, Ref, Result, Schema, Scope, Semaphore, Stream, Struct } from "effect";
 import "effect-agent/agent-registration";
 import { DurableAgentRuntime, DurableRuntimeConfig, RecoveryBlocked, RecoveryFailure, RecoverySweepResult, isolateRecovery } from "effect-agent/durable-agent-runtime";
 import { SubmissionId, ThreadId } from "effect-agent/identifiers";
@@ -18,6 +18,7 @@ var Alarm_exports = /* @__PURE__ */ __exportAll({
 	MaintenancePassReport: () => MaintenancePassReport,
 	ThreadHostMaintenance: () => ThreadHostMaintenance,
 	ThreadMaintenance: () => ThreadMaintenance,
+	ThreadMaintenanceActivity: () => ThreadMaintenanceActivity,
 	ThreadMaintenanceFailpoint: () => ThreadMaintenanceFailpoint,
 	ThreadMessageDelivery: () => ThreadMessageDelivery,
 	ThreadMutationGate: () => ThreadMutationGate,
@@ -111,6 +112,27 @@ var ThreadPublication = class extends Context.Service()("@effect-agent/platform-
 		pendingDeadline: Effect.succeed(Option.none())
 	});
 };
+/** Event-local accounting shared by the existing maintenance pumps and native scheduler. */
+var ThreadMaintenanceActivity = class ThreadMaintenanceActivity extends Context.Service()("@effect-agent/platform-cloudflare/ThreadMaintenanceActivity") {
+	/** Join child pumps; acknowledge the parent only after every child is ready or has exited. */
+	static all = Effect.fnUntraced(function* (lanes) {
+		const activity = yield* ThreadMaintenanceActivity;
+		let remaining = lanes.length;
+		if (remaining === 0) return yield* activity.ready.pipe(Effect.as([]));
+		return yield* Effect.forEach(lanes, (lane) => {
+			let ready = false;
+			const child = {
+				...activity,
+				ready: Effect.suspend(() => {
+					if (ready) return Effect.void;
+					ready = true;
+					return --remaining === 0 ? activity.ready : Effect.void;
+				}).pipe(Effect.uninterruptible)
+			};
+			return lane.pipe(Effect.provideService(ThreadMaintenanceActivity, child), Effect.onExit(() => child.ready));
+		}, { concurrency: "unbounded" });
+	});
+};
 /**
 * Host-assembled native message recovery. The driver bounds each actual Claim and persists its
 * timeout/retry before this pump returns. Do not add a second timer starting at batch selection:
@@ -122,14 +144,16 @@ const ThreadMessageDelivery = Context.Reference("@effect-agent/platform-cloudfla
 }) });
 /**
 * Application obligations sharing this Object's alarm. Admit one initial external wave even on
-* a caught-up pass, then respond to wakes until dispatchClosed. This closes only admission
-* of NEW external waves; native work can continue while admitted waves finish. Keep local
-* admission/hub subscriptions in the event Scope until maintenance tears it down.
+* a caught-up pass, then respond to wakes and ThreadMaintenanceActivity.subscribeChanges until
+* dispatchClosed. Yield the event's ThreadMaintenanceActivity to bracket each finite lane with
+* run and acknowledge initial setup with ready.
+* Passive subscriptions do not count as active work. Closure stops both new waves and native
+* Attempts; local admission/control subscriptions belong to the event Scope until teardown.
 * No deadline sleeps or automatic retry loops. Return after already-admitted waves finish.
 *
 * Declare a finite whole-wave allowance (1..300000ms): maximum for parallel lanes, sum for
 * sequential operations. Admit a wave only if its allowance fits before dispatchUntil. Later
-* arrivals cannot renew the retirement window. Maintenance bounds the join after dispatchClosed,
+* arrivals cannot renew an admitted wave's allowance. Maintenance bounds each registered wave,
 * interrupts and joins event Scope, then reads local deadlines under the mutation gate.
 *
 * Setup and pendingDeadline are bounded local operations. Persist claims/envelopes before
@@ -286,10 +310,10 @@ var ThreadMutationGate = class ThreadMutationGate extends Context.Service()("@ef
 *    recovery, ledger scans or canonical-history reads.
 * 2. Reconcile before each head Attempt, then checkpoint only the observed generation. A racing
 *    producer keeps its newer generation dirty. Native retries retain their durable backoff.
-* 3. Keep delivery admission open while old recovery is pending, so fresh native replies can
-*    publish in this event. Close once, at latest at the original ten-minute yield deadline;
-*    native wakes can still advance heads while admitted deliveries retire.
-* 4. Native message delivery retains its driver-owned Claim deadline. Host/backfill joins are
+* 3. Keep native and delivery admission open together while finite waves remain active, so
+*    fresh replies and abort controls can progress during unrelated cleanup. Close atomically
+*    at quiescence, or at the original ten-minute yield deadline, before retiring listeners.
+* 4. Native message delivery retains its driver-owned Claim deadline. Host/backfill waves are
 *    bounded independently; incoming native work never restarts or cancels their attempts.
 *    Auxiliary failures are reported after the current native opportunity.
 * 5. Close every event resource before the final gated deadline snapshot and alarm decision.
@@ -637,6 +661,47 @@ var ThreadMaintenance = class ThreadMaintenance extends Context.Service()("@effe
 			const notified = (yield* Stream.toPull(wakes.wakes)).pipe(Effect.asVoid, Effect.catch(() => Effect.never));
 			const started = yield* beginNative(observed);
 			const auxiliaryScope = yield* Effect.acquireRelease(Scope.make("parallel"), (scope, exit) => Scope.close(scope, exit));
+			const dispatchClosed = yield* Deferred.make();
+			const stopDispatch = Deferred.await(dispatchClosed);
+			const checks = yield* PubSub.sliding(1);
+			yield* Effect.addFinalizer(() => PubSub.shutdown(checks));
+			let dispatchOpen = true;
+			let activityChanged = yield* Deferred.make();
+			const signalActivity = Effect.suspend(() => Deferred.succeed(activityChanged, void 0));
+			const closeDispatch = Effect.sync(() => {
+				dispatchOpen = false;
+			}).pipe(Effect.andThen(Deferred.succeed(dispatchClosed, void 0)));
+			const makeActivity = Effect.fnUntraced(function* (allowance) {
+				const initialized = yield* Deferred.make();
+				let active = 0;
+				let failed = false;
+				return {
+					activity: {
+						ready: Deferred.succeed(initialized, void 0).pipe(Effect.andThen(signalActivity), Effect.asVoid, Effect.uninterruptible),
+						subscribeChanges: PubSub.subscribe(checks).pipe(Effect.map(PubSub.take)),
+						run: (wave) => Effect.acquireUseRelease(Effect.sync(() => {
+							if (!dispatchOpen) return false;
+							active++;
+							return true;
+						}), (admitted) => !admitted ? Effect.void : (allowance === void 0 ? wave : wave.pipe(Effect.timeoutOrElse({
+							duration: allowance,
+							orElse: () => DurableAlarmError.make({
+								operation: "host dispatch allowance",
+								message: "The admitted host wave exceeded its allowance; durable work remains pending"
+							})
+						}))).pipe(Effect.onExit((exit) => Effect.sync(() => {
+							if (Exit.isFailure(exit)) failed = true;
+						}))), (admitted) => Effect.sync(() => {
+							if (admitted) active--;
+						}).pipe(Effect.andThen(signalActivity)))
+					},
+					initialized: Deferred.await(initialized),
+					quiet: () => active === 0 && Deferred.isDoneUnsafe(initialized),
+					failed: () => failed
+				};
+			});
+			const messageActivity = yield* makeActivity();
+			const hostActivity = yield* makeActivity(host.dispatchTimeoutMillis);
 			const recovery = {
 				queue: yield* Deferred.make(),
 				pending: /* @__PURE__ */ new Set(),
@@ -664,18 +729,23 @@ var ThreadMaintenance = class ThreadMaintenance extends Context.Service()("@effe
 					yield* wakes.notify(threadId);
 				}
 			}), auxiliaryScope);
-			const dispatchClosed = yield* Deferred.make();
-			const stopDispatch = Deferred.await(dispatchClosed);
-			const deliveryFiber = yield* Effect.forkIn(Scope.provide(auxiliaryScope)(messages.drainUntil(stopDispatch, dispatchUntil)), auxiliaryScope);
+			const deliveryFiber = yield* Effect.forkIn(Scope.provide(auxiliaryScope)(messages.drainUntil(stopDispatch, dispatchUntil).pipe(Effect.provideService(ThreadMaintenanceActivity, messageActivity.activity), Effect.onExit(() => messageActivity.activity.ready))), auxiliaryScope);
 			const hostFiber = yield* Effect.forkIn(Scope.provide(auxiliaryScope)(Effect.gen(function* () {
 				yield* Schema.decodeEffect(AuxiliaryDispatchMillis)(host.dispatchTimeoutMillis).pipe(Effect.mapError((cause) => DurableAlarmError.make({
 					operation: "host dispatch allowance",
 					message: "Declare an integer whole-wave allowance between 1 and 300000 milliseconds",
 					cause
 				})));
-				yield* host.drainUntil(stopDispatch, dispatchUntil);
-			})), auxiliaryScope);
-			const backfill = yield* Effect.forkIn(drainDue.pipe(Effect.provideService(ThreadProjectionMaintenance, projection), Effect.timeoutOption(config.projectionDispatchTimeoutMillis)), auxiliaryScope);
+				const initialization = hostActivity.initialized.pipe(Effect.timeoutOrElse({
+					duration: host.dispatchTimeoutMillis,
+					orElse: () => DurableAlarmError.make({
+						operation: "host initialization",
+						message: "The host did not account for initial maintenance before its allowance; durable work remains pending"
+					})
+				}), Effect.andThen(Effect.never));
+				yield* Effect.raceFirst(host.drainUntil(stopDispatch, dispatchUntil).pipe(Effect.provideService(ThreadMaintenanceActivity, hostActivity.activity)), initialization);
+			}).pipe(Effect.onExit(() => hostActivity.activity.ready))), auxiliaryScope);
+			const backfill = yield* Effect.forkIn(drainDue.pipe(Effect.provideService(ThreadProjectionMaintenance, projection), Effect.timeoutOption(config.projectionDispatchTimeoutMillis), Effect.onExit(() => signalActivity)), auxiliaryScope);
 			let result = yield* advance(started, yieldAfter, observed, recovery);
 			recovery.started = true;
 			yield* Deferred.succeed(recovery.queue, []);
@@ -694,9 +764,9 @@ var ThreadMaintenance = class ThreadMaintenance extends Context.Service()("@effe
 				backfill,
 				recoveryFiber
 			]));
-			const auxiliaryPending = () => deliveryFiber.pollUnsafe() === void 0 || hostFiber.pollUnsafe() === void 0 || backfill.pollUnsafe() === void 0 || recoveryFiber.pollUnsafe() === void 0;
 			while (true) {
 				const recoveryFinished = recoveryFiber.pollUnsafe() !== void 0;
+				const retiredExit = retired.pollUnsafe();
 				if (recoveryFinished) {
 					if (recovery.needsCheckpoint) {
 						yield* Fiber.join(recoveryFiber);
@@ -704,27 +774,43 @@ var ThreadMaintenance = class ThreadMaintenance extends Context.Service()("@effe
 						if (result.phase === "actionable") phase = "actionable";
 						settled += result.settled;
 						recovery.needsCheckpoint = false;
+						yield* PubSub.publish(checks, void 0);
 					}
-					yield* Deferred.succeed(dispatchClosed, void 0);
 				}
-				if (retired.pollUnsafe() !== void 0 || !auxiliaryPending()) break;
+				if (retiredExit !== void 0 && Exit.isFailure(retiredExit)) break;
+				if (recoveryFinished && backfill.pollUnsafe() !== void 0 && messageActivity.quiet() && hostActivity.quiet()) {
+					const now = yield* Clock.currentTimeMillis;
+					const messageDeadline = yield* messages.pendingDeadline;
+					const hostDeadline = yield* host.pendingDeadline;
+					const messageDue = deliveryFiber.pollUnsafe() === void 0 && !messageActivity.failed() && Option.isSome(messageDeadline) && messageDeadline.value <= now;
+					const hostDue = hostFiber.pollUnsafe() === void 0 && !hostActivity.failed() && now + host.dispatchTimeoutMillis <= DateTime.toEpochMillis(dispatchUntil) && Option.isSome(hostDeadline) && hostDeadline.value <= now;
+					if (yield* Effect.sync(() => {
+						if (messageDue || hostDue || !messageActivity.quiet() || !hostActivity.quiet()) return false;
+						dispatchOpen = false;
+						return true;
+					})) break;
+					yield* PubSub.publish(checks, void 0);
+				}
 				const now = yield* Clock.currentTimeMillis;
 				const until = DateTime.toEpochMillis(yieldAfter);
 				if (now >= until) break;
 				const next = Math.min(result.nextAttemptAt ?? Infinity, now + config.wakeScanInterval, until);
 				const recoveryDone = recoveryFinished ? Effect.never : Fiber.await(recoveryFiber);
-				const ready = yield* Effect.raceFirst(Effect.raceFirst(notified, Effect.sleep(Math.max(0, next - now))).pipe(Effect.as("native")), Effect.raceFirst(recoveryDone.pipe(Effect.as("recovery")), Fiber.await(retired).pipe(Effect.as("retired"))));
-				if (ready === "recovery") continue;
-				if (ready === "retired" || retired.pollUnsafe() !== void 0) break;
-				if (!auxiliaryPending()) continue;
+				const retirementDone = retiredExit === void 0 ? Fiber.await(retired) : Effect.never;
+				const changed = activityChanged;
+				const ready = yield* Effect.raceFirst(Effect.raceFirst(notified, Effect.sleep(Math.max(0, next - now))).pipe(Effect.as("native")), Effect.raceFirst(recoveryDone.pipe(Effect.as("recovery")), Effect.raceFirst(retirementDone.pipe(Effect.as("retired")), Deferred.await(changed).pipe(Effect.as("activity")))));
+				if (ready === "recovery" || ready === "retired") continue;
+				if (ready === "activity") activityChanged = yield* Deferred.make();
 				if ((yield* Clock.currentTimeMillis) >= until) break;
+				if (ready === "native") yield* PubSub.publish(checks, void 0);
 				const awakened = yield* beginNative(observed);
 				result = yield* advance(awakened, yieldAfter, observed, recovery);
 				if (result.phase === "actionable") phase = "actionable";
 				settled += result.settled;
 				observed.nativeOnly = false;
+				if (result.settled > 0) yield* PubSub.publish(checks, void 0);
 			}
-			yield* Deferred.succeed(dispatchClosed, void 0);
+			yield* closeDispatch;
 			yield* Fiber.join(retired);
 			if (recovery.needsCheckpoint) {
 				result = yield* advance(started, yieldAfter, observed, recovery, false);
@@ -786,6 +872,6 @@ var ThreadMaintenance = class ThreadMaintenance extends Context.Service()("@effe
 	}));
 };
 //#endregion
-export { DurableAlarmError, DurableAlarmService, MaintenancePassReport, ThreadHostMaintenance, ThreadMaintenance, ThreadMaintenanceFailpoint, ThreadMessageDelivery, ThreadMutationGate, ThreadPublication, ThreadRecoveryFault, publishCommitted, Alarm_exports as t };
+export { DurableAlarmError, DurableAlarmService, MaintenancePassReport, ThreadHostMaintenance, ThreadMaintenance, ThreadMaintenanceActivity, ThreadMaintenanceFailpoint, ThreadMessageDelivery, ThreadMutationGate, ThreadPublication, ThreadRecoveryFault, publishCommitted, Alarm_exports as t };
 
 //# sourceMappingURL=Alarm.mjs.map