@remit/imap-worker 0.0.88 → 0.0.90

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

@@ -3,23 +3,20 @@ import {
 	ListObjectsV2Command,
 	S3Client,
 } from "@aws-sdk/client-s3";
-import { SendMessageCommand } from "@aws-sdk/client-sqs";
 import type { Logger } from "@remit/logger";
-import { createQueueProducer } from "@remit/sqs-client/producer";
 import { env } from "expect-env";
 import type { DeleteAccountObjectsEvent } from "../events.js";
+import type { WorkerQueues } from "../queues.js";
 
 const s3 = new S3Client({});
 
-const sqsQueueUrl = env.SQS_QUEUE_URL_MESSAGE_MGMT;
-const sqs = createQueueProducer({ queueUrl: sqsQueueUrl });
-
 const BATCH_SIZE = 1_000;
 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;
@@ -41,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;
 		}
 
@@ -85,6 +82,7 @@ export const handleDeleteAccountObjects = async (
 };
 
 const reenqueue = async (
+	queues: WorkerQueues,
 	accountConfigId: string,
 	continuationToken: string | undefined,
 ): Promise<void> => {
@@ -94,10 +92,5 @@ const reenqueue = async (
 		continuationToken,
 	};
 
-	await sqs.send(
-		new SendMessageCommand({
-			QueueUrl: sqsQueueUrl,
-			MessageBody: JSON.stringify(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

@@ -52,7 +52,7 @@ const arrange = async (): Promise<Arranged> => {
 		addressService: w.client.address,
 		mailboxSpecialUseService: w.client.mailboxSpecialUse,
 		mailboxService: w.client.mailbox,
-		sqsQueueUrl: process.env.SQS_QUEUE_URL_MESSAGE_MGMT ?? "",
+		queue: w.client.queues.messageManagement,
 	});
 	return { w, inbox, junk, message, placement };
 };
@@ -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

package/src/handlers/probe-message-id.sqlite.test.ts

@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import { afterEach, beforeEach, describe, it, mock } from "node:test";
-import { SQSClient } from "@aws-sdk/client-sqs";
 import type { MailboxItem } from "@remit/data-ports";
+import { recordingQueue } from "@remit/data-ports/recording-queue";
 import {
 	AccountAuthType,
 	ConnectionState,
@@ -171,15 +171,13 @@ describe("the Message-ID the move, delete and copy probes ask with", () => {
 	it("reads the source's Message-ID for a copy", async () => {
 		const sourceId = await syncInbox("<report@example.com>");
 		const archive = await createMailbox("Archive");
-		mock.method(SQSClient.prototype, "send", async () => ({}));
-
 		const copyId = await new MessageMoveService({
 			messageService: messages,
 			mailboxService: mailboxes,
 			mailboxSpecialUseService: repos.mailboxSpecialUse,
 			threadMessageService: threadMessages,
 			addressService: repos.address,
-			sqsQueueUrl: "https://queue.test/messages",
+			queue: recordingQueue().fifo,
 		}).copyMessage(ACCOUNT_CONFIG_ID, sourceId, archive.mailboxId, accountId);
 
 		assert.notEqual(copyId, sourceId);

package/src/handlers/sync-mailboxes.ts

@@ -21,16 +21,17 @@ import {
 	MailboxSyncService,
 	MailConnectionError,
 	type MailCredentials,
+	standardMailboxManagement,
 } from "@remit/mailbox-service";
-import { env } from "expect-env";
 import pMap from "p-map";
 import {
 	isAccountDeleted,
 	isMailSyncDisabled,
 	isUnsyncableHost,
 } from "../account-check.js";
-import { emitEvent } from "../emit.js";
+import { createEmitEvent, type EmitEvent } from "../emit.js";
 import type { SyncMailboxesEvent, SyncMessagesEvent } from "../events.js";
+import type { WorkerQueues } from "../queues.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
 import { createImportedFolder } from "./imported-folder.js";
@@ -95,6 +96,7 @@ export const mailboxNeedsSync = (
 export const syncMailboxes = async (
 	event: SyncMailboxesEvent,
 	log: Logger,
+	queues: WorkerQueues,
 ): Promise<void> => {
 	const client = await getClient();
 	const {
@@ -118,7 +120,7 @@ export const syncMailboxes = async (
 			mailboxService,
 			new MailboxQueueService({
 				mailboxService,
-				sqsQueueUrl: env.SQS_QUEUE_URL_MAILBOX_MGMT,
+				enqueue: standardMailboxManagement(queues.mailboxManagement),
 				logger: log,
 			}),
 		),
@@ -166,6 +168,7 @@ export const syncMailboxes = async (
 					accountService,
 					binder,
 					log,
+					createEmitEvent(queues),
 				);
 			} catch (err) {
 				// Auth failures are handled by the wrapper — rethrow untouched so it
@@ -199,6 +202,7 @@ const syncMailboxesForAccount = async (
 	accountService: IAccountRepository,
 	binder: ConfigBinderDeps,
 	log: Logger,
+	emit: EmitEvent,
 ): Promise<void> => {
 	const { accountId } = account;
 
@@ -330,7 +334,7 @@ const syncMailboxesForAccount = async (
 		mailboxCountSynced: skipped,
 	});
 
-	await emitSyncMessagesEvents(accountId, mailboxes, emitEvent);
+	await emitSyncMessagesEvents(accountId, mailboxes, emit);
 };
 
 type SyncMessagesInput = Omit<SyncMessagesEvent, "eventId" | "timestamp">;

package/src/handlers/sync-message-body.sqlite.test.ts

@@ -73,7 +73,7 @@ const arrange = async (): Promise<Arranged> => {
 };
 
 const run = (a: Arranged, receiveCount = 1) =>
-	syncMessageBody(a.event, a.w.log, receiveCount, a.w.scope);
+	syncMessageBody(a.event, a.w.log, a.w.queues, receiveCount, a.w.scope);
 
 const bodyFetches = (a: Arranged): string[] => a.w.imap.commands("BODY");
 
@@ -160,7 +160,7 @@ const batchOf = (
 });
 
 const runBatch = (w: World, event: SyncMessageBodyEvent, receiveCount = 1) =>
-	syncMessageBody(event, w.log, receiveCount, w.scope);
+	syncMessageBody(event, w.log, w.queues, receiveCount, w.scope);
 
 const arrangeFiling = async () => {
 	const w = await store.world();

package/src/handlers/sync-message-body.ts

@@ -25,6 +25,7 @@ import {
 	createConnectionScopeWithCredentials,
 } from "../connection-scope.js";
 import type { SyncMessageBodyEvent } from "../events.js";
+import type { WorkerQueues } from "../queues.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
 import { workerVersion } from "../worker-version.js";
@@ -87,6 +88,7 @@ export const buildRetryableFailureError = (
 export const syncMessageBody = async (
 	event: SyncMessageBodyEvent,
 	log: Logger,
+	queues: WorkerQueues,
 	receiveCount = 1,
 	createConnectionScope = createConnectionScopeWithCredentials,
 ): Promise<void> => {
@@ -156,18 +158,15 @@ export const syncMessageBody = async (
 	// PLACEMENT_MOVE_PUSH rides messageMgmtQueue (issue #1271) — same queue
 	// the general MessageMoveService move/delete/copy machinery uses, not a
 	// dedicated one.
-	const placementMoveQueueUrl = process.env.SQS_QUEUE_URL_MESSAGE_MGMT;
-	const placementMoveService = placementMoveQueueUrl
-		? new PlacementMoveService({
-				messageService,
-				threadMessageService,
-				markerService,
-				addressService,
-				mailboxSpecialUseService,
-				mailboxService,
-				sqsQueueUrl: placementMoveQueueUrl,
-			})
-		: undefined;
+	const placementMoveService = new PlacementMoveService({
+		messageService,
+		threadMessageService,
+		markerService,
+		addressService,
+		mailboxSpecialUseService,
+		mailboxService,
+		queue: queues.messageManagement,
+	});
 
 	await withOAuthLifecycle(
 		buildLifecycleDeps(secrets, accountService),
@@ -220,12 +219,10 @@ export const syncMessageBody = async (
 			// A confident, actionable placement verdict moves mail directly on
 			// body-sync. Safety lives in the verdict itself (only confident,
 			// INBOX/Junk-only) and the movedByRemit loop guard.
-			const placementConfig = placementMoveService
-				? {
-						mailboxSpecialUseService,
-						placementMoveService,
-					}
-				: undefined;
+			const placementConfig = {
+				mailboxSpecialUseService,
+				placementMoveService,
+			};
 
 			// A matched filter's actions (label upsert, exclusive move) apply on
 			// the same body-sync pass, reusing the placement mover for the move

package/src/handlers/sync-messages.sqlite.test.ts

@@ -1,5 +1,6 @@
 import assert from "node:assert/strict";
 import { after, before, describe, it } from "node:test";
+import { createEmitEvent } from "../emit.js";
 import type { SyncMessagesEvent } from "../events.js";
 import { openStore, type World } from "../test-helpers/test-world.js";
 import { drainPendingFlagPushes, syncMessages } from "./sync-messages.js";
@@ -21,7 +22,12 @@ const syncEvent = (w: World, mailboxId: string): SyncMessagesEvent => ({
 });
 
 const sync = async (w: World, mailboxId: string): Promise<number> => {
-	await syncMessages(syncEvent(w, mailboxId), w.log, w.connectionFactory);
+	await syncMessages(
+		syncEvent(w, mailboxId),
+		w.log,
+		w.queues,
+		w.connectionFactory,
+	);
 	return w.imap.connections;
 };
 
@@ -106,7 +112,12 @@ describe("a folder deleted while its sync is in flight", () => {
 			return { getConnection: () => connection, close: factory.close };
 		};
 
-		await syncMessages(syncEvent(w, old.mailboxId), w.log, connectionFactory);
+		await syncMessages(
+			syncEvent(w, old.mailboxId),
+			w.log,
+			w.queues,
+			connectionFactory,
+		);
 
 		const account = await w.client.account.get(w.account.accountId);
 		assert.notEqual(account.syncPhase, "error");
@@ -142,6 +153,7 @@ describe("drainPendingFlagPushes (issue #1273)", () => {
 			w.account,
 			inbox.mailboxId,
 			w.log,
+			createEmitEvent(w.queues),
 		);
 
 		assert.deepEqual(

package/src/handlers/sync-messages.ts

@@ -35,12 +35,17 @@ import {
 	isMailSyncDisabled,
 	isUnsyncableHost,
 } from "../account-check.js";
-import { emitEvent, SYNC_MESSAGES_PENDING } from "../emit.js";
+import {
+	createEmitEvent,
+	type EmitEvent,
+	SYNC_MESSAGES_PENDING,
+} from "../emit.js";
 import type {
 	FlagPushEvent,
 	SyncMessageBodyEvent,
 	SyncMessagesEvent,
 } from "../events.js";
+import type { WorkerQueues } from "../queues.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
 import { workerVersion } from "../worker-version.js";
@@ -77,6 +82,7 @@ export const managedConnectionFor = (
 export const syncMessages = async (
 	event: SyncMessagesEvent,
 	log: Logger,
+	queues: WorkerQueues,
 	createConnectionFactory = managedConnectionFor,
 ): Promise<void> => {
 	log.info(
@@ -212,6 +218,7 @@ export const syncMessages = async (
 								syncWarningRepository,
 								flagPushMarkerService,
 								messageFlagService,
+								emit: createEmitEvent(queues),
 							},
 							log,
 						);
@@ -290,6 +297,7 @@ interface SyncDeps {
 	syncWarningRepository: ISyncWarningRepository;
 	flagPushMarkerService: IMessageFlagPushRepository;
 	messageFlagService: IMessageFlagRepository;
+	emit: EmitEvent;
 }
 
 // Bounds concurrent SQS sends while re-arming stuck flag-push markers —
@@ -314,16 +322,13 @@ const FLAG_PUSH_DRAIN_CONCURRENCY = 5;
  * loudly — it must never fail the surrounding SYNC_MESSAGES batch, which is
  * unrelated message-header sync work. The marker stays durable regardless;
  * the next periodic tick tries again.
- *
- * `emit` defaults to the real `emitEvent` (imap-worker's shared SQS
- * producer) and is only ever overridden in tests.
  */
 export const drainPendingFlagPushes = async (
 	flagPushMarkerService: IMessageFlagPushRepository,
 	account: AccountItem,
 	mailboxId: string,
 	log: Logger,
-	emit: typeof emitEvent = emitEvent,
+	emit: EmitEvent,
 ): Promise<void> => {
 	const markers = await flagPushMarkerService.listByMailboxId(mailboxId);
 	const stuck = markers.filter((marker) => marker.state === "pending");
@@ -383,6 +388,7 @@ const syncMailboxMessages = async (
 		syncWarningRepository,
 		flagPushMarkerService,
 		messageFlagService,
+		emit,
 	} = deps;
 
 	// Get the mailbox - it must exist (should have been created by mailbox sync)
@@ -392,7 +398,13 @@ const syncMailboxMessages = async (
 	// Periodic drain (issue #1273): independent of the IMAP sync below — no
 	// connection needed, just an SQS re-arm — so it runs regardless of this
 	// round's sync outcome.
-	await drainPendingFlagPushes(flagPushMarkerService, account, mailboxId, log);
+	await drainPendingFlagPushes(
+		flagPushMarkerService,
+		account,
+		mailboxId,
+		log,
+		emit,
+	);
 	const isInbox = mailbox.fullPath.toUpperCase() === "INBOX";
 
 	const syncService = new MessageSyncService(
@@ -466,7 +478,7 @@ const syncMailboxMessages = async (
 					messageIds: batch.map((m) => m.messageId),
 					messages: batch.map((m) => ({ messageId: m.messageId, uid: m.uid })),
 				};
-				return emitEvent(bodyEvent);
+				return emit(bodyEvent);
 			},
 			{ concurrency: EVENT_EMIT_CONCURRENCY },
 		);
@@ -484,7 +496,7 @@ const syncMailboxMessages = async (
 			accountId: event.accountId,
 			mailboxId,
 		};
-		await emitEvent(nextSyncEvent);
+		await emit(nextSyncEvent);
 		return;
 	}
 

package/src/index.ts

@@ -9,8 +9,10 @@ import type { SQSBatchResponse, SQSEvent, SQSHandler } from "aws-lambda";
 import type { WorkerEvent } from "./events.js";
 import { imapFailureKind } from "./failure-kind.js";
 import { processEvent } from "./processor.js";
+import { sqsWorkerQueues, workerQueueUrlsFromEnv } from "./queues.js";
 
 installNodeLogger();
+const queues = sqsWorkerQueues(workerQueueUrlsFromEnv());
 
 const log = createLogger();
 
@@ -45,7 +47,7 @@ export const handler: SQSHandler = withTelemetry(
 
 			const queue = queueNameFromEventSource(record.eventSourceARN);
 			const opStart = Date.now();
-			const failed = await processEvent(imapEvent, log, receiveCount)
+			const failed = await processEvent(imapEvent, log, queues, receiveCount)
 				.then(() => {
 					recordQueueEvent({
 						queue,