@remit/imap-worker 0.0.89 → 0.0.90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/imap-worker",
-  "version": "0.0.89",
+  "version": "0.0.90",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/cli.ts

@@ -6,12 +6,8 @@
 // in npm-scripts/docker-bundle.mjs). Do not route it through the logger — usage
 // text and argument errors are for the person who typed the command.
 import { parseArgs } from "node:util";
-import { emitEvent } from "./emit.js";
-import {
-	setWorkerQueues,
-	sqsWorkerQueues,
-	workerQueueUrlsFromEnv,
-} from "./queues.js";
+import { createEmitEvent } from "./emit.js";
+import { sqsWorkerQueues, workerQueueUrlsFromEnv } from "./queues.js";
 
 const HELP = `
 remit-imap-worker - Process IMAP sync events
@@ -209,11 +205,9 @@ const buildEvent = () => {
 
 const event = buildEvent();
 
-setWorkerQueues(sqsWorkerQueues(workerQueueUrlsFromEnv()));
-
 console.log(`Enqueueing ${event.type} event for account ${event.accountId}...`);
 
-emitEvent(event)
+createEmitEvent(sqsWorkerQueues(workerQueueUrlsFromEnv()))(event)
 	.then(() => {
 		console.log("Event enqueued successfully");
 		process.exit(0);

package/src/emit.test.ts

@@ -11,13 +11,18 @@ import {
 } from "@remit/data-ports/recording-queue";
 import { MailboxLockRepo } from "@remit/drizzle-service";
 import { createShippedSqliteDb } from "@remit/drizzle-service/test-sqlite";
-import { emitEvent, SYNC_MESSAGES_PENDING } from "./emit.js";
+import {
+	createEmitEvent,
+	type EmitEvent,
+	SYNC_MESSAGES_PENDING,
+} from "./emit.js";
 import type {
 	FlagPushEvent,
 	SyncMailboxesEvent,
+	SyncMessageBodyEvent,
 	SyncMessagesEvent,
 } from "./events.js";
-import { setWorkerQueues } from "./queues.js";
+import { workerQueuesOn } from "./test-helpers/worker-queues.js";
 
 type Emitted<T> = Omit<T, "eventId" | "timestamp">;
 
@@ -27,16 +32,11 @@ let queue: RecordingQueue;
 
 const sentCommands = () => queue.sent;
 
+const emitEvent: EmitEvent = (event) =>
+	createEmitEvent(workerQueuesOn(queue))(event);
+
 beforeEach(() => {
 	queue = recordingQueue();
-	setWorkerQueues({
-		mailboxes: queue,
-		messages: queue,
-		flags: queue,
-		body: queue,
-		mailboxManagement: queue,
-		messageManagement: queue,
-	});
 	const store = createShippedSqliteDb();
 	closeStore = store.close;
 	locks = new MailboxLockRepo(store.db);
@@ -125,3 +125,21 @@ describe("emitEvent on a FIFO queue", () => {
 		assert.equal(sent.deduplicationId, sent.body.eventId);
 	});
 });
+
+describe("emitEvent on a standard queue", () => {
+	it("sends a body sync with no group or deduplication id", async () => {
+		const event: Emitted<SyncMessageBodyEvent> = {
+			type: "SYNC_MESSAGE_BODY",
+			accountId: "acc-1",
+			mailboxId: "mbx-1",
+			messageIds: ["msg-1"],
+		};
+
+		await emitEvent(event);
+
+		const [sent] = sentCommands();
+		if (!sent) throw new Error("expected a send");
+		assert.equal(sent.groupId, undefined);
+		assert.equal(sent.deduplicationId, undefined);
+	});
+});

package/src/emit.ts

@@ -1,32 +1,53 @@
 import { randomUUID } from "node:crypto";
 import { getClient } from "@remit/backend/client";
-import type { FifoQueueProducer } from "@remit/data-ports";
+import type { FifoQueueProducer, QueueProducer } from "@remit/data-ports";
 import { recordImapFailure } from "@remit/logger-lambda/metrics";
 import type { ImapEvent } from "./events.js";
-import { type WorkerQueues, workerQueues } from "./queues.js";
+import type { WorkerQueues } from "./queues.js";
 
 type EventInput = Omit<ImapEvent, "eventId" | "timestamp">;
 
+export type EmitEvent = (event: EventInput) => Promise<void>;
+
+type Send = (event: ImapEvent) => Promise<void>;
+
+// The deduplication id is the event's own id, so the queue suppresses a
+// re-send of one event (the retry SQS's own idempotency guard is for) and
+// nothing else. A shared id per account or per mailbox instead made the
+// 5-minute window a rate limiter: the second sync of a mailbox within five
+// minutes was discarded before any worker saw it, so mail that arrived after
+// a sync could not be fetched until the window elapsed (issue #37).
+const fifo =
+	(queue: FifoQueueProducer<ImapEvent>): Send =>
+	(event) =>
+		queue.send({
+			body: event,
+			groupId: event.accountId,
+			deduplicationId: event.eventId,
+		});
+
+const standard =
+	(queue: QueueProducer<ImapEvent>): Send =>
+	(event) =>
+		queue.send({ body: event });
+
 export const SYNC_MESSAGES_PENDING = "SYNC_MESSAGES_PENDING";
 
 const SYNC_MESSAGES_PENDING_TTL_SECONDS = 300;
 
-const queueFor = (
-	type: ImapEvent["type"],
-	queues: WorkerQueues,
-): FifoQueueProducer<ImapEvent> => {
+const senderFor = (type: ImapEvent["type"], queues: WorkerQueues): Send => {
 	switch (type) {
 		case "SYNC_MAILBOXES":
-			return queues.mailboxes;
+			return fifo(queues.mailboxes);
 		case "SYNC_MESSAGES":
-			return queues.messages;
+			return fifo(queues.messages);
 		// SYNC_MESSAGE_BODY routes to the single standard body queue (#612).
 		case "SYNC_MESSAGE_BODY":
-			return queues.body;
+			return standard(queues.body);
 		case "MAILBOX_CREATE":
 		case "MAILBOX_RENAME":
 		case "MAILBOX_DELETE":
-			return queues.mailboxManagement;
+			return standard(queues.mailboxManagement);
 		case "MESSAGE_DELETE":
 		case "MESSAGE_MOVE":
 		case "MESSAGE_COPY":
@@ -36,7 +57,7 @@ const queueFor = (
 		// payload carries only our message id (never a UID, unlike the legacy
 		// MESSAGE_MOVE event); per-event-type payload shape, same queue.
 		case "PLACEMENT_MOVE_PUSH":
-			return queues.messageManagement;
+			return standard(queues.messageManagement);
 		// Rides the existing flags queue (issue #1273) — this is imap-worker's OWN
 		// re-arm hint (the periodic per-mailbox sync tick catching up a marker
 		// stuck `pending`), distinct from `FlagPushService`'s user-facing hint
@@ -44,74 +65,51 @@ const queueFor = (
 		// already consumes; dispatch is by `type`, not by which queue delivered
 		// the message.
 		case "FLAG_PUSH":
-			return queues.flags;
+			return fifo(queues.flags);
 	}
 };
 
-export interface EmitEventOptions {
-	/**
-	 * Delay delivery of the message by this many seconds (0-900).
-	 * Useful for retry backoff to avoid overwhelming IMAP servers.
-	 */
-	delaySeconds?: number;
-}
-
-export const emitEvent = async (
-	event: EventInput,
-	options?: EmitEventOptions,
-) => {
-	const fullEvent: ImapEvent = {
-		...event,
-		eventId: randomUUID(),
-		timestamp: Date.now(),
-	} as ImapEvent;
-
-	const queue = queueFor(event.type, workerQueues());
-
-	// The deduplication id is the event's own id, so the queue suppresses a
-	// re-send of one event (the retry SQS's own idempotency guard is for) and
-	// nothing else. A shared id per account or per mailbox instead made the
-	// 5-minute window a rate limiter: the second sync of a mailbox within five
-	// minutes was discarded before any worker saw it, so mail that arrived after
-	// a sync could not be fetched until the window elapsed (issue #37).
-	const send = () =>
-		queue.send({
-			body: fullEvent,
-			groupId: event.accountId,
-			deduplicationId: fullEvent.eventId,
-			...(options?.delaySeconds && { delaySeconds: options.delaySeconds }),
-		});
-	if (fullEvent.type !== "SYNC_MESSAGES") {
-		await send();
-		return;
-	}
+export const createEmitEvent =
+	(queues: WorkerQueues): EmitEvent =>
+	async (event) => {
+		const fullEvent: ImapEvent = {
+			...event,
+			eventId: randomUUID(),
+			timestamp: Date.now(),
+		} as ImapEvent;
 
-	const { mailboxLock } = await getClient();
-	const { accountId, mailboxId, eventId } = fullEvent;
-	const previous = await mailboxLock.get(
-		accountId,
-		mailboxId,
-		SYNC_MESSAGES_PENDING,
-	);
-	const acquired = await mailboxLock.tryAcquireLock(
-		mailboxId,
-		SYNC_MESSAGES_PENDING,
-		accountId,
-		eventId,
-		SYNC_MESSAGES_PENDING_TTL_SECONDS,
-	);
-	if (!acquired) return;
-	if (previous && previous.ttl < Math.floor(Date.now() / 1000)) {
-		recordImapFailure("SYNC_PENDING_EXPIRED", "other");
-	}
+		const send = () => senderFor(fullEvent.type, queues)(fullEvent);
+		if (fullEvent.type !== "SYNC_MESSAGES") {
+			await send();
+			return;
+		}
 
-	await send().catch(async (error: unknown) => {
-		await mailboxLock.releaseLock(
+		const { mailboxLock } = await getClient();
+		const { accountId, mailboxId, eventId } = fullEvent;
+		const previous = await mailboxLock.get(
 			accountId,
 			mailboxId,
 			SYNC_MESSAGES_PENDING,
+		);
+		const acquired = await mailboxLock.tryAcquireLock(
+			mailboxId,
+			SYNC_MESSAGES_PENDING,
+			accountId,
 			eventId,
+			SYNC_MESSAGES_PENDING_TTL_SECONDS,
 		);
-		throw error;
-	});
-};
+		if (!acquired) return;
+		if (previous && previous.ttl < Math.floor(Date.now() / 1000)) {
+			recordImapFailure("SYNC_PENDING_EXPIRED", "other");
+		}
+
+		await send().catch(async (error: unknown) => {
+			await mailboxLock.releaseLock(
+				accountId,
+				mailboxId,
+				SYNC_MESSAGES_PENDING,
+				eventId,
+			);
+			throw error;
+		});
+	};

package/src/handlers/delete-account-objects.test.ts

@@ -12,7 +12,7 @@ import {
 import { noopLogger } from "@remit/logger";
 import { mockClient } from "aws-sdk-client-mock";
 import type { DeleteAccountObjectsEvent } from "../events.js";
-import { setWorkerQueues } from "../queues.js";
+import { workerQueuesOn } from "../test-helpers/worker-queues.js";
 import { handleDeleteAccountObjects } from "./delete-account-objects.js";
 
 const s3Mock = mockClient(S3Client);
@@ -26,14 +26,6 @@ const event: DeleteAccountObjectsEvent = {
 describe("handleDeleteAccountObjects", () => {
 	beforeEach(() => {
 		queue = recordingQueue();
-		setWorkerQueues({
-			mailboxes: queue,
-			messages: queue,
-			flags: queue,
-			body: queue,
-			mailboxManagement: queue,
-			messageManagement: queue,
-		});
 	});
 
 	afterEach(() => {
@@ -50,7 +42,7 @@ describe("handleDeleteAccountObjects", () => {
 		});
 		s3Mock.on(DeleteObjectsCommand).resolves({});
 
-		await handleDeleteAccountObjects(event, noopLogger);
+		await handleDeleteAccountObjects(event, noopLogger, workerQueuesOn(queue));
 
 		const listCall = s3Mock.commandCalls(ListObjectsV2Command)[0];
 		assert.equal(listCall.args[0].input.Prefix, "accounts/cfg-1/");
@@ -77,7 +69,7 @@ describe("handleDeleteAccountObjects", () => {
 			});
 		s3Mock.on(DeleteObjectsCommand).resolves({});
 
-		await handleDeleteAccountObjects(event, noopLogger);
+		await handleDeleteAccountObjects(event, noopLogger, workerQueuesOn(queue));
 
 		const listCalls = s3Mock.commandCalls(ListObjectsV2Command);
 		assert.equal(listCalls.length, 2);
@@ -88,7 +80,7 @@ describe("handleDeleteAccountObjects", () => {
 	it("skips the delete call when a page holds no keys", async () => {
 		s3Mock.on(ListObjectsV2Command).resolves({ IsTruncated: false });
 
-		await handleDeleteAccountObjects(event, noopLogger);
+		await handleDeleteAccountObjects(event, noopLogger, workerQueuesOn(queue));
 
 		assert.equal(s3Mock.commandCalls(DeleteObjectsCommand).length, 0);
 	});
@@ -99,6 +91,7 @@ describe("handleDeleteAccountObjects", () => {
 		await handleDeleteAccountObjects(
 			{ ...event, continuationToken: "tok-mid" },
 			noopLogger,
+			workerQueuesOn(queue),
 			() => 5_000,
 		);
 
@@ -120,7 +113,12 @@ describe("handleDeleteAccountObjects", () => {
 		});
 		s3Mock.on(DeleteObjectsCommand).resolves({});
 
-		await handleDeleteAccountObjects(event, noopLogger, () => 120_000);
+		await handleDeleteAccountObjects(
+			event,
+			noopLogger,
+			workerQueuesOn(queue),
+			() => 120_000,
+		);
 
 		assert.equal(s3Mock.commandCalls(ListObjectsV2Command).length, 1);
 		assert.equal(queue.sent.length, 0);

package/src/handlers/delete-account-objects.ts

@@ -6,7 +6,7 @@ import {
 import type { Logger } from "@remit/logger";
 import { env } from "expect-env";
 import type { DeleteAccountObjectsEvent } from "../events.js";
-import { workerQueues } from "../queues.js";
+import type { WorkerQueues } from "../queues.js";
 
 const s3 = new S3Client({});
 
@@ -16,6 +16,7 @@ const MIN_REMAINING_MS = 30_000;
 export const handleDeleteAccountObjects = async (
 	event: DeleteAccountObjectsEvent,
 	log: Logger,
+	queues: WorkerQueues,
 	getRemainingTimeMs?: () => number,
 ): Promise<void> => {
 	const BUCKET_NAME = env.S3_BUCKET_NAME;
@@ -37,7 +38,7 @@ export const handleDeleteAccountObjects = async (
 				{ accountConfigId, totalDeleted, continuationToken: currentToken },
 				"Near timeout, re-enqueuing with continuation token",
 			);
-			await reenqueue(accountConfigId, currentToken);
+			await reenqueue(queues, accountConfigId, currentToken);
 			return;
 		}
 
@@ -81,6 +82,7 @@ export const handleDeleteAccountObjects = async (
 };
 
 const reenqueue = async (
+	queues: WorkerQueues,
 	accountConfigId: string,
 	continuationToken: string | undefined,
 ): Promise<void> => {
@@ -90,5 +92,5 @@ const reenqueue = async (
 		continuationToken,
 	};
 
-	await workerQueues().messageManagement.send({ body: event });
+	await queues.messageManagement.send({ body: event });
 };

package/src/handlers/message-copy.sqlite.test.ts

@@ -73,7 +73,7 @@ const arrange = async (
 };
 
 const run = (a: Arranged, receiveCount = 1) =>
-	handleMessageCopy(a.event, a.w.log, receiveCount, a.w.scope);
+	handleMessageCopy(a.event, a.w.log, a.w.queues, receiveCount, a.w.scope);
 
 describe("a message copy", () => {
 	it("lands at the destination, leaves the source alone and settles the copy row", async () => {
@@ -264,7 +264,7 @@ describe("a fresh copy acted on before the server confirms it", () => {
 		assert.ok(event, "the move enqueued a MESSAGE_MOVE");
 		assert.equal(event.uid, copyUid);
 
-		await handleMessageMove(event, a.w.log, 1, a.w.scope);
+		await handleMessageMove(event, a.w.log, a.w.queues, 1, a.w.scope);
 
 		assert.deepEqual(a.w.imap.uids("Projects", a.messageIdHeader), []);
 		assert.equal(a.w.imap.uids("INBOX", a.messageIdHeader).length, 2);
@@ -288,7 +288,7 @@ describe("a fresh copy acted on before the server confirms it", () => {
 		const event = a.w.queued().find(isDelete);
 		assert.ok(event, "the delete enqueued a MESSAGE_DELETE");
 
-		await handleMessageDelete(event, a.w.log, 1, a.w.scope);
+		await handleMessageDelete(event, a.w.log, a.w.queues, 1, a.w.scope);
 
 		assert.deepEqual(a.w.imap.uids("Projects", a.messageIdHeader), []);
 		assert.deepEqual(a.w.imap.uids("INBOX"), [a.uid]);

package/src/handlers/message-copy.ts

@@ -14,9 +14,10 @@ import {
 import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { isAccountDeleted } from "../account-check.js";
 import { createConnectionScopeWithCredentials } from "../connection-scope.js";
-import { emitEvent } from "../emit.js";
+import { createEmitEvent } from "../emit.js";
 import type { MessageCopyEvent } from "../events.js";
 import { findMailboxRow } from "../mailbox-row.js";
+import type { WorkerQueues } from "../queues.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
 import {
@@ -68,9 +69,11 @@ export type CopyProbe =
 export const handleMessageCopy = async (
 	event: MessageCopyEvent,
 	log: Logger,
+	queues: WorkerQueues,
 	receiveCount = 1,
 	createConnectionScope = createConnectionScopeWithCredentials,
 ): Promise<void> => {
+	const emit = createEmitEvent(queues);
 	const {
 		account: accountService,
 		message: messageService,
@@ -383,7 +386,7 @@ export const handleMessageCopy = async (
 					}
 				}
 
-				await emitMoveResync(emitEvent, {
+				await emitMoveResync(emit, {
 					accountId,
 					sourceMailboxId,
 					destinationMailboxId,

package/src/handlers/message-delete.sqlite.test.ts

@@ -72,7 +72,7 @@ const arrange = async (
 };
 
 const run = (a: Arranged, receiveCount = 1, event = a.event) =>
-	handleMessageDelete(event, a.w.log, receiveCount, a.w.scope);
+	handleMessageDelete(event, a.w.log, a.w.queues, receiveCount, a.w.scope);
 
 const resyncs = (w: World): unknown[] =>
 	w

package/src/handlers/message-delete.ts

@@ -24,9 +24,10 @@ import {
 import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { isAccountDeleted } from "../account-check.js";
 import { createConnectionScopeWithCredentials } from "../connection-scope.js";
-import { emitEvent } from "../emit.js";
+import { createEmitEvent } from "../emit.js";
 import type { MessageDeleteEvent } from "../events.js";
 import { findMailboxRow } from "../mailbox-row.js";
+import type { WorkerQueues } from "../queues.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
 import { resolveExhaustedMessageDeleteFailure } from "./message-delete-terminal.js";
@@ -153,9 +154,11 @@ const confirmTrashMoveUid = async (
 export const handleMessageDelete = async (
 	event: MessageDeleteEvent,
 	log: Logger,
+	queues: WorkerQueues,
 	receiveCount = 1,
 	createConnectionScope = createConnectionScopeWithCredentials,
 ): Promise<void> => {
+	const emit = createEmitEvent(queues);
 	const {
 		account: accountService,
 		message: messageService,
@@ -246,14 +249,14 @@ export const handleMessageDelete = async (
 	 */
 	const emitSettleResync = async (): Promise<void> => {
 		if (destinationMailboxId) {
-			await emitMoveResync(emitEvent, {
+			await emitMoveResync(emit, {
 				accountId,
 				sourceMailboxId: mailboxId,
 				destinationMailboxId,
 			});
 			return;
 		}
-		await emitMailboxResync(emitEvent, { accountId, mailboxId });
+		await emitMailboxResync(emit, { accountId, mailboxId });
 	};
 
 	/**
@@ -623,7 +626,7 @@ export const handleMessageDelete = async (
 					"Refused to delete: the destination mailbox no longer exists (deleted)",
 					"message_delete_destination_gone",
 				);
-				await emitMailboxResync(emitEvent, { accountId, mailboxId });
+				await emitMailboxResync(emit, { accountId, mailboxId });
 				return;
 			}
 

package/src/handlers/message-move.sqlite.test.ts

@@ -68,7 +68,7 @@ const arrange = async (
 };
 
 const run = (a: Arranged, receiveCount = 1) =>
-	handleMessageMove(a.event, a.w.log, receiveCount, a.w.scope);
+	handleMessageMove(a.event, a.w.log, a.w.queues, receiveCount, a.w.scope);
 
 const resyncs = (w: World): unknown[] =>
 	w

package/src/handlers/message-move.ts

@@ -17,9 +17,10 @@ import {
 import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { isAccountDeleted } from "../account-check.js";
 import { createConnectionScopeWithCredentials } from "../connection-scope.js";
-import { emitEvent } from "../emit.js";
+import { createEmitEvent } from "../emit.js";
 import type { MessageMoveEvent, SyncMessagesEvent } from "../events.js";
 import { findMailboxRow } from "../mailbox-row.js";
+import type { WorkerQueues } from "../queues.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
 import { resolveExhaustedMessageMoveFailure } from "./message-move-terminal.js";
@@ -244,9 +245,11 @@ export const buildThreadMessageMoveUpdate = (
 export const handleMessageMove = async (
 	event: MessageMoveEvent,
 	log: Logger,
+	queues: WorkerQueues,
 	receiveCount = 1,
 	createConnectionScope = createConnectionScopeWithCredentials,
 ): Promise<void> => {
+	const emit = createEmitEvent(queues);
 	const {
 		account: accountService,
 		message: messageService,
@@ -343,7 +346,7 @@ export const handleMessageMove = async (
 					},
 					"MESSAGE_MOVE not pushed: source mailbox no longer exists (deleted); stale row reconciled",
 				);
-				await emitMailboxResync(emitEvent, {
+				await emitMailboxResync(emit, {
 					accountId,
 					mailboxId: destinationMailboxId,
 				});
@@ -449,7 +452,7 @@ export const handleMessageMove = async (
 					{ metric: "message_move_destination_gone" },
 					"destination mailbox no longer exists (deleted)",
 				);
-				await emitMailboxResync(emitEvent, {
+				await emitMailboxResync(emit, {
 					accountId,
 					mailboxId: sourceMailboxId,
 				});
@@ -543,7 +546,7 @@ export const handleMessageMove = async (
 					);
 				}
 
-				await emitMoveResync(emitEvent, {
+				await emitMoveResync(emit, {
 					accountId,
 					sourceMailboxId,
 					destinationMailboxId,
@@ -624,7 +627,7 @@ export const handleMessageMove = async (
 							await settleMoved(newUid);
 						},
 						() =>
-							emitMoveResync(emitEvent, {
+							emitMoveResync(emit, {
 								accountId,
 								sourceMailboxId,
 								destinationMailboxId,
@@ -739,7 +742,7 @@ export const handleMessageMove = async (
 					// re-projects it with the server's own UID. BROKEN, the row has just
 					// been put back at the source the server confirmed, and the resync
 					// is what carries any drift either folder has picked up since.
-					await emitMoveResync(emitEvent, {
+					await emitMoveResync(emit, {
 						accountId,
 						sourceMailboxId,
 						destinationMailboxId,

package/src/handlers/placement-move-push.ts

@@ -14,9 +14,10 @@ import {
 import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { isAccountDeleted } from "../account-check.js";
 import { createConnectionScopeWithCredentials } from "../connection-scope.js";
-import { emitEvent } from "../emit.js";
+import { createEmitEvent } from "../emit.js";
 import type { PlacementMovePushEvent } from "../events.js";
 import { findMailboxRow } from "../mailbox-row.js";
+import type { WorkerQueues } from "../queues.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
 import {
@@ -152,9 +153,11 @@ export const attemptMove = async (
 export const handlePlacementMovePush = async (
 	event: PlacementMovePushEvent,
 	log: Logger,
+	queues: WorkerQueues,
 	receiveCount = 1,
 	createConnectionScope = createConnectionScopeWithCredentials,
 ): Promise<void> => {
+	const emit = createEmitEvent(queues);
 	const {
 		account: accountService,
 		mailbox: mailboxService,
@@ -238,7 +241,7 @@ export const handlePlacementMovePush = async (
 				"Placement move not pushed: its source folder is gone; the stale row was reconciled",
 			);
 			if (destination.kind === "present") {
-				await emitMailboxResync(emitEvent, {
+				await emitMailboxResync(emit, {
 					accountId,
 					mailboxId: marker.destinationMailboxId,
 				});
@@ -261,7 +264,7 @@ export const handlePlacementMovePush = async (
 			context,
 			"Placement move not pushed: its destination folder is gone; the row was handed back to its source",
 		);
-		await emitMailboxResync(emitEvent, {
+		await emitMailboxResync(emit, {
 			accountId,
 			mailboxId: marker.sourceMailboxId,
 		});
@@ -354,7 +357,7 @@ export const handlePlacementMovePush = async (
 							},
 							"Message no longer at its pending-move source (external delete or moved away); marker dropped, stale row reconciled",
 						);
-						await emitMoveResync(emitEvent, {
+						await emitMoveResync(emit, {
 							accountId,
 							sourceMailboxId: marker.sourceMailboxId,
 							destinationMailboxId: marker.destinationMailboxId,
@@ -404,7 +407,7 @@ export const handlePlacementMovePush = async (
 						"Placement move confirmed on IMAP; marker cleared",
 					);
 
-					await emitMoveResync(emitEvent, {
+					await emitMoveResync(emit, {
 						accountId,
 						sourceMailboxId: marker.sourceMailboxId,
 						destinationMailboxId: marker.destinationMailboxId,
@@ -452,7 +455,7 @@ export const handlePlacementMovePush = async (
 					);
 
 					if (outcome === "reconciled") {
-						await emitMoveResync(emitEvent, {
+						await emitMoveResync(emit, {
 							accountId,
 							sourceMailboxId: marker.sourceMailboxId,
 							destinationMailboxId: marker.destinationMailboxId,

package/src/handlers/placement-push.sqlite.test.ts

@@ -92,7 +92,8 @@ const pushMove = (
 	a: Arranged,
 	event: PlacementMovePushEvent,
 	receiveCount = 1,
-) => handlePlacementMovePush(event, a.w.log, receiveCount, a.w.scope);
+) =>
+	handlePlacementMovePush(event, a.w.log, a.w.queues, receiveCount, a.w.scope);
 
 const seenOnServer = (a: Arranged, path: string): boolean[] =>
 	a.w.imap