@yielded/agent-platform-cloudflare 0.1.0-beta.175 → 0.1.0-beta.176

package/dist/{Alarm-B44efvB1.mjs → Alarm-7uipp6LW.mjs}

@@ -410,49 +410,48 @@ const makeAlarmOperation = Effect.gen(function* () {
 	const queue = make(ctx.storage);
 	const transaction = (body) => alarms.transaction((mutations) => Effect.withFiber((owner) => {
 		let active = true;
-		const requireActive = Effect.withFiber((fiber) => active && fiber === owner ? Effect.void : Effect.fail(DurableAlarmError.make({
-			operation: "enroll maintenance source",
-			message: "Source intent requires its active transaction callback's fiber"
-		})));
-		return body.pipe(Effect.provideService(CurrentCheckpoint, {
+		return Effect.onExitPrimitive(body(owner).pipe(Effect.provideService(CurrentCheckpoint, {
 			mutations,
-			requireActive
-		}), Effect.ensuring(Effect.sync(() => {
+			isActive: (fiber) => active && fiber === owner
+		})), () => {
 			active = false;
-		})));
+		});
 	}), { sqlClient: sql }).pipe(Effect.mapError((cause) => cause instanceof DurableObjectStorage.StorageOperationError ? SqlError.make({ reason: UnknownError.make({
 		operation: "commit maintenance checkpoint",
 		message: "Source facts and maintenance checkpoint could not commit",
 		cause
 	}) }) : cause));
-	const withTransaction = (body) => Effect.flatMap(Effect.serviceOption(sql.transactionService), (ambient) => {
+	const withTransaction = (body) => Effect.withFiber((fiber) => {
+		const ambient = Context.getOption(fiber.context, sql.transactionService);
 		if (ambient._tag === "Some" && !ownsTransaction(ctx.storage, ambient.value[1])) return Effect.fail(SqlError.make({ reason: UnknownError.make({
 			operation: "begin maintenance source transaction",
 			message: "Use ThreadMutationGate.withTransaction at the outermost source transaction",
 			cause: "Unwrapped SQL transaction cannot own buffered maintenance intent"
 		}) }));
-		return Effect.uninterruptibleMask((restore) => Effect.suspend(() => {
-			let frame;
-			return transaction(Effect.flatMap(Effect.serviceOption(sql.transactionService), (transaction) => Effect.gen(function* () {
-				if (transaction._tag === "None") return yield* SqlError.make({ reason: UnknownError.make({
-					operation: "begin maintenance source transaction",
-					message: "SQL transaction unavailable",
-					cause: "SQL transaction unavailable"
-				}) });
-				frame = queue.begin(transaction.value[1]);
-			})).pipe(Effect.andThen(restore(body)), Effect.tap(() => Effect.try({
+		let frame;
+		return Effect.uninterruptibleMask((restore) => Effect.onExitPrimitive(transaction((owner) => {
+			const current = Context.getOption(owner.context, sql.transactionService);
+			if (current._tag === "None") return SqlError.make({ reason: UnknownError.make({
+				operation: "begin maintenance source transaction",
+				message: "SQL transaction unavailable",
+				cause: "SQL transaction unavailable"
+			}) });
+			const started = queue.begin(current.value[1]);
+			frame = started;
+			return Effect.flatMap(restore(body), (value) => Effect.try({
 				try: () => {
-					if (frame !== void 0) queue.flush(frame);
+					queue.flush(started);
+					return value;
 				},
 				catch: (cause) => SqlError.make({ reason: UnknownError.make({
 					cause,
 					operation: "flush maintenance due queue",
 					message: "Maintenance intent could not commit"
 				}) })
-			})))).pipe(Effect.onExit((exit) => Effect.sync(() => {
-				if (frame !== void 0) queue.finish(frame, Exit.isSuccess(exit));
-			})), Effect.provideService(Scheduler.PreventSchedulerYield, true));
-		}));
+			}));
+		}), (exit) => {
+			if (frame !== void 0) queue.finish(frame, Exit.isSuccess(exit));
+		}).pipe(Effect.provideService(Scheduler.PreventSchedulerYield, true)));
 	}).pipe(Effect.provideService(SqlClient, sql));
 	const run = (operation, execute) => {
 		const commit = Effect.withFiber((fiber) => {
@@ -461,28 +460,30 @@ const makeAlarmOperation = Effect.gen(function* () {
 				operation: "checkpoint",
 				message: "Maintenance checkpoint transaction unavailable"
 			}));
-			return tx.requireActive.pipe(Effect.andThen(Effect.suspend(() => {
-				let checkpoint = Effect.void;
-				const intent = {
-					at: (at) => {
-						checkpoint = tx.mutations.scheduleAlarm(maintenanceAlarmInput(at));
-					},
-					earlier: (at) => {
-						checkpoint = tx.mutations.scheduleAlarmEarlier(maintenanceAlarmInput(at));
-					},
-					cancel: () => {
-						checkpoint = tx.mutations.cancelAlarm(maintenanceAlarmRef);
-					}
-				};
-				return Effect.tryPromise({
-					try: () => execute(ctx.storage, intent),
-					catch: alarmFailure(operation)
-				}).pipe(Effect.tap(() => checkpoint));
-			})));
+			if (!tx.isActive(fiber)) return Effect.fail(DurableAlarmError.make({
+				operation: "enroll maintenance source",
+				message: "Source intent requires its active transaction callback's fiber"
+			}));
+			let checkpoint = Effect.void;
+			const intent = {
+				at: (at) => {
+					checkpoint = tx.mutations.scheduleAlarm(maintenanceAlarmInput(at));
+				},
+				earlier: (at) => {
+					checkpoint = tx.mutations.scheduleAlarmEarlier(maintenanceAlarmInput(at));
+				},
+				cancel: () => {
+					checkpoint = tx.mutations.cancelAlarm(maintenanceAlarmRef);
+				}
+			};
+			return Effect.tryPromise({
+				try: () => execute(ctx.storage, intent),
+				catch: alarmFailure(operation)
+			}).pipe(Effect.tap(() => checkpoint));
 		});
 		return Effect.withFiber((fiber) => {
 			if (fiber.getRef(CurrentCheckpoint) !== void 0) return commit;
-			return Context.getOption(fiber.context, sql.transactionService)._tag === "Some" && !buffering(ctx.storage) ? transaction(commit).pipe(Effect.ensuring(Effect.sync(() => invalidate(ctx.storage)))) : withTransaction(commit);
+			return Context.getOption(fiber.context, sql.transactionService)._tag === "Some" && !buffering(ctx.storage) ? transaction(() => commit).pipe(Effect.ensuring(Effect.sync(() => invalidate(ctx.storage)))) : withTransaction(commit);
 		}).pipe(Effect.uninterruptible, Effect.mapError(alarmFailure(operation)));
 	};
 	return {
@@ -1896,4 +1897,4 @@ var ThreadMaintenance = class ThreadMaintenance extends Context.Service()("@effe
 //#endregion
 export { Lifecycle as _, ThreadHostMaintenance as a, Projection as b, ThreadMaintenanceFailpoint as c, ThreadNativeMaintenance as d, ThreadPublication as f, HostLaneId as g, publishCommitted as h, MaintenancePassReport as i, ThreadMessageDelivery as l, ThreadRecoveryFaultEvent as m, DurableAlarmError as n, ThreadMaintenance as o, ThreadRecoveryEvents as p, DurableAlarmService as r, ThreadMaintenanceAlarm as s, Alarm_exports as t, ThreadMutationGate as u, Messages as v, Publication as x, Native as y };
 
-//# sourceMappingURL=Alarm-B44efvB1.mjs.map
+//# sourceMappingURL=Alarm-7uipp6LW.mjs.map