@fedify/fedify 2.0.0-dev.237 → 2.0.0-dev.279

package/dist/{federation-BbZwNNWj.js → federation-D6FVaeAR.js}

@@ -105,6 +105,11 @@ var InProcessMessageQueue = class {
 	#monitors;
 	#pollIntervalMs;
 	/**
+	* Tracks which ordering keys are currently being processed to ensure
+	* sequential processing for messages with the same key.
+	*/
+	#processingKeys;
+	/**
 	* In-process message queue does not provide native retry mechanisms.
 	* @since 1.7.0
 	*/
@@ -117,6 +122,7 @@ var InProcessMessageQueue = class {
 		this.#messages = [];
 		this.#monitors = {};
 		this.#pollIntervalMs = Temporal.Duration.from(options.pollInterval ?? { seconds: 5 }).total("millisecond");
+		this.#processingKeys = /* @__PURE__ */ new Set();
 	}
 	enqueue(message, options) {
 		const delay = options?.delay == null ? 0 : Math.max(options.delay.total("millisecond"), 0);
@@ -127,7 +133,11 @@ var InProcessMessageQueue = class {
 			}), delay);
 			return Promise.resolve();
 		}
-		this.#messages.push(message);
+		const orderingKey = options?.orderingKey ?? null;
+		this.#messages.push({
+			message,
+			orderingKey
+		});
 		for (const monitorId in this.#monitors) this.#monitors[monitorId]();
 		return Promise.resolve();
 	}
@@ -141,18 +151,29 @@ var InProcessMessageQueue = class {
 			}), delay);
 			return Promise.resolve();
 		}
-		this.#messages.push(...messages);
+		const orderingKey = options?.orderingKey ?? null;
+		for (const message of messages) this.#messages.push({
+			message,
+			orderingKey
+		});
 		for (const monitorId in this.#monitors) this.#monitors[monitorId]();
 		return Promise.resolve();
 	}
 	async listen(handler, options = {}) {
 		const signal = options.signal;
 		while (signal == null || !signal.aborted) {
-			while (this.#messages.length > 0) {
-				const message = this.#messages.shift();
-				await handler(message);
-			}
-			await this.#wait(this.#pollIntervalMs, signal);
+			const idx = this.#messages.findIndex((m) => m.orderingKey == null || !this.#processingKeys.has(m.orderingKey));
+			if (idx >= 0) {
+				const queued = this.#messages.splice(idx, 1)[0];
+				const { message, orderingKey } = queued;
+				if (orderingKey != null) this.#processingKeys.add(orderingKey);
+				try {
+					await handler(message);
+				} finally {
+					if (orderingKey != null) this.#processingKeys.delete(orderingKey);
+				}
+			} else if (this.#messages.length === 0) await this.#wait(this.#pollIntervalMs, signal);
+			else await this.#wait(10, signal);
 		}
 	}
 	#wait(ms, signal) {
@@ -184,6 +205,21 @@ var InProcessMessageQueue = class {
 * for I/O-bound tasks, but not for CPU-bound tasks, which is okay for Fedify's
 * workloads.
 *
+* When using `ParallelMessageQueue`, the ordering guarantee is preserved
+* *only if* the underlying queue implementation delivers messages in a wrapper
+* format that includes the `__fedify_ordering_key__` property.  Currently,
+* only `DenoKvMessageQueue` and `WorkersMessageQueue` use this format.
+* For other queue implementations (e.g., `InProcessMessageQueue`,
+* `RedisMessageQueue`, `PostgresMessageQueue`, `SqliteMessageQueue`,
+* `AmqpMessageQueue`), the ordering key cannot be detected by
+* `ParallelMessageQueue`, so ordering guarantees are handled by those
+* implementations directly rather than at the `ParallelMessageQueue` level.
+*
+* Messages with the same ordering key will never be processed concurrently
+* by different workers, ensuring sequential processing within each key.
+* Messages with different ordering keys (or no ordering key) can still be
+* processed in parallel.
+*
 * @since 1.0.0
 */
 var ParallelMessageQueue = class ParallelMessageQueue {
@@ -195,6 +231,15 @@ var ParallelMessageQueue = class ParallelMessageQueue {
 	*/
 	nativeRetrial;
 	/**
+	* Tracks which ordering keys are currently being processed to ensure
+	* sequential processing for messages with the same key.
+	*/
+	#processingKeys = /* @__PURE__ */ new Set();
+	/**
+	* Pending messages waiting for their ordering key to become available.
+	*/
+	#pendingMessages = [];
+	/**
 	* Constructs a new {@link ParallelMessageQueue} with the given queue and
 	* number of workers.
 	* @param queue The message queue to use under the hood.  Note that
@@ -222,6 +267,25 @@ var ParallelMessageQueue = class ParallelMessageQueue {
 		}
 		await this.queue.enqueueMany(messages, options);
 	}
+	/**
+	* Extracts ordering key from a message if present.
+	*
+	* This method only works for queue implementations that deliver messages
+	* in the wrapper format with `__fedify_ordering_key__` property.  Currently,
+	* only `DenoKvMessageQueue` and `WorkersMessageQueue` use this format.
+	*
+	* For other queue implementations (`InProcessMessageQueue`,
+	* `RedisMessageQueue`, `PostgresMessageQueue`, `SqliteMessageQueue`,
+	* `AmqpMessageQueue`), messages are delivered as raw payloads without the
+	* wrapper, so the ordering key cannot be detected here.  Those
+	* implementations handle ordering guarantees internally.
+	*/
+	#extractOrderingKey(message) {
+		if (message != null && typeof message === "object") {
+			if ("__fedify_ordering_key__" in message) return message.__fedify_ordering_key__;
+		}
+		return void 0;
+	}
 	listen(handler, options = {}) {
 		const workers = /* @__PURE__ */ new Map();
 		return this.queue.listen(async (message) => {
@@ -230,13 +294,33 @@ var ParallelMessageQueue = class ParallelMessageQueue {
 				workers.delete(consumedId);
 			}
 			const workerId = crypto.randomUUID();
-			const promise = this.#work(workerId, handler, message);
+			const orderingKey = this.#extractOrderingKey(message);
+			if (orderingKey != null && this.#processingKeys.has(orderingKey)) await new Promise((resolve) => {
+				this.#pendingMessages.push({
+					message,
+					orderingKey,
+					resolve
+				});
+			});
+			if (orderingKey != null) this.#processingKeys.add(orderingKey);
+			const promise = this.#work(workerId, handler, message, orderingKey);
 			workers.set(workerId, promise);
 		}, options);
 	}
-	async #work(workerId, handler, message) {
+	async #work(workerId, handler, message, orderingKey) {
 		await this.#sleep(0);
-		await handler(message);
+		try {
+			await handler(message);
+		} finally {
+			if (orderingKey != null) {
+				this.#processingKeys.delete(orderingKey);
+				const pendingIdx = this.#pendingMessages.findIndex((p) => p.orderingKey === orderingKey);
+				if (pendingIdx >= 0) {
+					const pending = this.#pendingMessages.splice(pendingIdx, 1)[0];
+					pending.resolve();
+				}
+			}
+		}
 		return workerId;
 	}
 	#sleep(ms) {

package/dist/{http-Cc7n4Qoh.js → http-7r8B3dF_.js}

@@ -13,7 +13,7 @@ import { getDocumentLoader } from "@fedify/vocab-runtime";
 
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.0.0-dev.237+7f2bb1de";
+var version = "2.0.0-dev.279+ce1bdc22";
 var license = "MIT";
 var exports = {
 	".": "./src/mod.ts",
@@ -57,7 +57,13 @@ var exclude = [
 	"src/cfworkers/server.js",
 	"src/cfworkers/server.js.map"
 ];
-var publish = { "exclude": ["**/*.test.ts", "src/testing/"] };
+var publish = { "exclude": [
+	"**/*.test.ts",
+	"src/testing/",
+	"tsdown.config.ts",
+	"scripts/",
+	"wrangler.toml"
+] };
 var tasks = {
 	"codegen": "deno task -f @fedify/vocab compile",
 	"cache": {

package/dist/{http-8TlrsZoL.cjs → http-DMi5iyiI.cjs}

@@ -14,7 +14,7 @@ const __fedify_vocab_runtime = require_chunk.__toESM(require("@fedify/vocab-runt
 
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.0.0-dev.237+7f2bb1de";
+var version = "2.0.0-dev.279+ce1bdc22";
 var license = "MIT";
 var exports$1 = {
 	".": "./src/mod.ts",
@@ -58,7 +58,13 @@ var exclude = [
 	"src/cfworkers/server.js",
 	"src/cfworkers/server.js.map"
 ];
-var publish = { "exclude": ["**/*.test.ts", "src/testing/"] };
+var publish = { "exclude": [
+	"**/*.test.ts",
+	"src/testing/",
+	"tsdown.config.ts",
+	"scripts/",
+	"wrangler.toml"
+] };
 var tasks = {
 	"codegen": "deno task -f @fedify/vocab compile",
 	"cache": {

package/dist/{http-CE72P83O.js → http-oCBlFLKT.js}

@@ -3,8 +3,8 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-RfS7RWmL.js";
-import { fetchKey, validateCryptoKey } from "./key-COCrawtF.js";
+import { deno_default } from "./deno-fe0u4LiE.js";
+import { fetchKey, validateCryptoKey } from "./key-BGzsKfpZ.js";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{inbox-CgoFwrkP.js → inbox-Dm1rfkdg.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-RfS7RWmL.js";
+import { deno_default } from "./deno-fe0u4LiE.js";
 import { getLogger } from "@logtape/logtape";
 import { Activity, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";

package/dist/{key-COCrawtF.js → key-BGzsKfpZ.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-RfS7RWmL.js";
+import { deno_default } from "./deno-fe0u4LiE.js";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{kv-cache-BEeqyGER.js → kv-cache-B__dHl7g.js}

@@ -43,7 +43,7 @@ var MockKvStore = class {
 	}
 };
 /**
-* Decorates a {@link DocumentLoader} with a cache backed by a {@link Deno.Kv}.
+* Decorates a {@link DocumentLoader} with a cache backed by a {@link KvStore}.
 * @param parameters The parameters for the cache.
 * @returns The decorated document loader which is cache-enabled.
 */

package/dist/{kv-cache-BV0LKQyf.cjs → kv-cache-C0AvpI7U.cjs}

@@ -3,7 +3,7 @@
           const { URLPattern } = require("urlpattern-polyfill");
         
 const require_chunk = require('./chunk-DqRYRqnO.cjs');
-const require_http = require('./http-8TlrsZoL.cjs');
+const require_http = require('./http-DMi5iyiI.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 const es_toolkit = require_chunk.__toESM(require("es-toolkit"));
 const __fedify_vocab_runtime = require_chunk.__toESM(require("@fedify/vocab-runtime"));
@@ -59,7 +59,7 @@ const logger = (0, __logtape_logtape.getLogger)([
 	"kv-cache"
 ]);
 /**
-* Decorates a {@link DocumentLoader} with a cache backed by a {@link Deno.Kv}.
+* Decorates a {@link DocumentLoader} with a cache backed by a {@link KvStore}.
 * @param parameters The parameters for the cache.
 * @returns The decorated document loader which is cache-enabled.
 */

package/dist/{kv-cache-DRGsvqdV.js → kv-cache-CETRZwoP.js}

@@ -2,7 +2,7 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { doubleKnock, validateCryptoKey } from "./http-Cc7n4Qoh.js";
+import { doubleKnock, validateCryptoKey } from "./http-7r8B3dF_.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getDocumentLoader, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";
@@ -58,7 +58,7 @@ const logger = getLogger([
 	"kv-cache"
 ]);
 /**
-* Decorates a {@link DocumentLoader} with a cache backed by a {@link Deno.Kv}.
+* Decorates a {@link DocumentLoader} with a cache backed by a {@link KvStore}.
 * @param parameters The parameters for the cache.
 * @returns The decorated document loader which is cache-enabled.
 */

package/dist/{ld-BaGGiySp.js → ld-BaO1-A5Y.js}

@@ -3,8 +3,8 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-RfS7RWmL.js";
-import { fetchKey, validateCryptoKey } from "./key-COCrawtF.js";
+import { deno_default } from "./deno-fe0u4LiE.js";
+import { fetchKey, validateCryptoKey } from "./key-BGzsKfpZ.js";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{middleware-C1a3efyY.js → middleware-BDJNulB_.js}

@@ -3,10 +3,10 @@
           import { URLPattern } from "urlpattern-polyfill";
         
 import "./transformers-N_ip_y4P.js";
-import "./http-Cc7n4Qoh.js";
-import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-B_oUqHDl.js";
-import "./proof-CPysx9bF.js";
+import "./http-7r8B3dF_.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-R0w-WauH.js";
+import "./proof-Cg6AAAWI.js";
 import "./types-8l28uC8o.js";
-import "./kv-cache-DRGsvqdV.js";
+import "./kv-cache-CETRZwoP.js";
 
 export { FederationImpl };

package/dist/{middleware-BNd2OPEY.js → middleware-BlOT9luD.js}

@@ -3,24 +3,24 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-RfS7RWmL.js";
+import { deno_default } from "./deno-fe0u4LiE.js";
 import { getNodeInfo } from "./client-Dg7OfUDA.js";
 import { RouterError } from "./router-D9eI0s4b.js";
 import { nodeInfoToJson } from "./types-CPz01LGH.js";
-import { exportJwk, importJwk, validateCryptoKey } from "./key-COCrawtF.js";
-import { verifyRequest } from "./http-CE72P83O.js";
-import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-BaGGiySp.js";
-import { doesActorOwnKey, getKeyOwner } from "./owner-UVBc7UEt.js";
-import { signObject, verifyObject } from "./proof-DSF9PSv9.js";
-import { getAuthenticatedDocumentLoader } from "./docloader-DvECEZ5H.js";
-import { kvCache } from "./kv-cache-BEeqyGER.js";
-import { routeActivity } from "./inbox-CgoFwrkP.js";
-import { FederationBuilderImpl } from "./builder-D9GtbwtV.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-BGzsKfpZ.js";
+import { verifyRequest } from "./http-oCBlFLKT.js";
+import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-BaO1-A5Y.js";
+import { doesActorOwnKey, getKeyOwner } from "./owner-BqIhDQWW.js";
+import { signObject, verifyObject } from "./proof-DoHt7qrS.js";
+import { getAuthenticatedDocumentLoader } from "./docloader-C9Dmxf-K.js";
+import { kvCache } from "./kv-cache-B__dHl7g.js";
+import { routeActivity } from "./inbox-Dm1rfkdg.js";
+import { FederationBuilderImpl } from "./builder-B7WWCOdc.js";
 import { buildCollectionSynchronizationHeader } from "./collection-CcnIw1qY.js";
 import { KvKeyCache } from "./keycache-DRxpZ5r9.js";
 import { acceptsJsonLd } from "./negotiation-5NPJL6zp.js";
 import { createExponentialBackoffPolicy } from "./retry-D4GJ670a.js";
-import { extractInboxes, sendActivity } from "./send-DoACJ0D8.js";
+import { extractInboxes, sendActivity } from "./send-CO2ZYT96.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { getDocumentLoader } from "@fedify/vocab-runtime";
@@ -1518,6 +1518,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}) });
 		await this.sendActivity(keys, message.inboxes, activity, {
 			collectionSync: message.collectionSync,
+			orderingKey: message.orderingKey,
 			context: context$1
 		});
 	}
@@ -1766,7 +1767,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			"federation",
 			"outbox"
 		]);
-		const { immediate, collectionSync, context: ctx } = options;
+		const { immediate, collectionSync, orderingKey, context: ctx } = options;
 		if (activity.id == null) throw new TypeError("The activity to send must have an id.");
 		if (activity.actorId == null) throw new TypeError("The activity to send must have at least one actor property.");
 		else if (keys.length < 1) throw new TypeError("The keys must not be empty.");
@@ -1854,6 +1855,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 		propagation.inject(context.active(), carrier);
 		const messages = [];
 		for (const inbox in inboxes) {
+			const inboxOrigin = new URL(inbox).origin;
+			const messageOrderingKey = orderingKey == null ? void 0 : `${orderingKey}\n${inboxOrigin}`;
 			const message = {
 				type: "outbox",
 				id: crypto.randomUUID(),
@@ -1867,13 +1870,29 @@ var FederationImpl = class extends FederationBuilderImpl {
 				started: (/* @__PURE__ */ new Date()).toISOString(),
 				attempt: 0,
 				headers: collectionSync == null ? {} : { "Collection-Synchronization": await buildCollectionSynchronizationHeader(collectionSync, inboxes[inbox].actorIds) },
+				orderingKey: messageOrderingKey,
 				traceContext: carrier
 			};
-			messages.push(message);
+			messages.push({
+				message,
+				orderingKey: messageOrderingKey
+			});
 		}
 		const { outboxQueue } = this;
 		if (outboxQueue.enqueueMany == null) {
-			const promises = messages.map((m) => outboxQueue.enqueue(m));
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
+			const results = await Promise.allSettled(promises);
+			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
+			if (errors.length > 0) {
+				logger$2.error("Failed to enqueue activity {activityId} to send later: {errors}", {
+					activityId: activity.id.href,
+					errors
+				});
+				if (errors.length > 1) throw new AggregateError(errors, `Failed to enqueue activity ${activityId} to send later.`);
+				throw errors[0];
+			}
+		} else if (orderingKey != null) {
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
 			const results = await Promise.allSettled(promises);
 			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
 			if (errors.length > 0) {
@@ -1885,7 +1904,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				throw errors[0];
 			}
 		} else try {
-			await outboxQueue.enqueueMany(messages);
+			await outboxQueue.enqueueMany(messages.map((m) => m.message));
 		} catch (error) {
 			logger$2.error("Failed to enqueue activity {activityId} to send later: {error}", {
 				activityId: activity.id.href,
@@ -2601,20 +2620,25 @@ var ContextImpl = class ContextImpl {
 		} else keys = [sender];
 		if (keys.length < 1) throw new TypeError("The sender's keys must not be empty.");
 		for (const { privateKey } of keys) validateCryptoKey(privateKey, "private");
-		const opts = { context: this };
 		let expandedRecipients;
+		let collectionSync;
 		if (Array.isArray(recipients)) expandedRecipients = recipients;
 		else if (recipients === "followers") {
 			if (identifier == null) throw new Error("If recipients is \"followers\", sender must be an actor identifier or username.");
 			expandedRecipients = [];
 			for await (const recipient of this.getFollowers(identifier)) expandedRecipients.push(recipient);
 			if (options.syncCollection) try {
-				opts.collectionSync = this.getFollowersUri(identifier).href;
+				collectionSync = this.getFollowersUri(identifier).href;
 			} catch (error) {
-				if (error instanceof RouterError) opts.collectionSync = void 0;
-				else throw error;
+				if (!(error instanceof RouterError)) throw error;
 			}
 		} else expandedRecipients = [recipients];
+		const opts = {
+			context: this,
+			orderingKey: options.orderingKey,
+			collectionSync,
+			immediate: options.immediate
+		};
 		span.setAttribute("activitypub.inboxes", expandedRecipients.length);
 		for (const activityTransformer of this.federation.activityTransformers) activity = activityTransformer(activity, this);
 		span?.setAttribute("activitypub.activity.id", activity?.id?.href ?? "");
@@ -2661,10 +2685,11 @@ var ContextImpl = class ContextImpl {
 			activityId: activity.id?.href,
 			activityType: getTypeId(activity).href,
 			collectionSync: opts.collectionSync,
+			orderingKey: options.orderingKey,
 			traceContext: carrier
 		};
 		if (!this.federation.manuallyStartQueue) this.federation._startQueueInternal(this.data);
-		this.federation.fanoutQueue.enqueue(message);
+		this.federation.fanoutQueue.enqueue(message, { orderingKey: options.orderingKey });
 	}
 	async *getFollowers(identifier) {
 		if (this.federation.followersCallbacks == null) throw new Error("No followers collection dispatcher registered.");
@@ -3016,8 +3041,10 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		}
 		const carrier = {};
 		propagation.inject(context.active(), carrier);
+		const orderingKey = options?.orderingKey;
 		const messages = [];
 		for (const inbox in inboxes) {
+			const inboxUrl = new URL(inbox);
 			const message = {
 				type: "outbox",
 				id: crypto.randomUUID(),
@@ -3031,13 +3058,29 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 				started: (/* @__PURE__ */ new Date()).toISOString(),
 				attempt: 0,
 				headers: {},
+				orderingKey: orderingKey == null ? void 0 : `${orderingKey}\n${inboxUrl.origin}`,
 				traceContext: carrier
 			};
-			messages.push(message);
+			messages.push({
+				message,
+				orderingKey: message.orderingKey
+			});
 		}
 		const { outboxQueue } = this.federation;
 		if (outboxQueue.enqueueMany == null) {
-			const promises = messages.map((m) => outboxQueue.enqueue(m));
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
+			const results = await Promise.allSettled(promises);
+			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
+			if (errors.length > 0) {
+				logger$2.error("Failed to enqueue activity {activityId} to forward later:\n{errors}", {
+					activityId: this.activityId,
+					errors
+				});
+				if (errors.length > 1) throw new AggregateError(errors, `Failed to enqueue activity ${this.activityId} to forward later.`);
+				throw errors[0];
+			}
+		} else if (orderingKey != null) {
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
 			const results = await Promise.allSettled(promises);
 			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
 			if (errors.length > 0) {
@@ -3049,7 +3092,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 				throw errors[0];
 			}
 		} else try {
-			await outboxQueue.enqueueMany(messages);
+			await outboxQueue.enqueueMany(messages.map((m) => m.message));
 		} catch (error) {
 			logger$2.error("Failed to enqueue activity {activityId} to forward later:\n{error}", {
 				activityId: this.activityId,