@remit/backend 0.0.7 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/backend",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Remit Mail Inspector API backend",
   "license": "MIT",
   "author": "",

package/src/handlers/sync.test.ts

@@ -62,6 +62,28 @@ describe("triggerSyncSafe", () => {
 		assert.equal(error.length, 0);
 	});
 
+	// The guarantee behind issue #37: POST /sync asks for a sync of this
+	// account by name, so the event it enqueues has to carry the mark that
+	// makes the worker's fan-out sync every mailbox rather than skip the fresh
+	// ones. Its callers are the refresh control, pull-to-refresh and the
+	// client's automatic poll — the poll is kept from abusing this by the
+	// interval floor in useStaleAccountSync, not by the server.
+	it("marks the event as an explicit request", async () => {
+		const sent: SendMessageCommand[] = [];
+		const { logger } = createLoggerSpy();
+
+		await triggerSyncSafe("acc-a", "config-1", {
+			sqsClient: okSqsClient(sent),
+			queueUrl: QUEUE_URL,
+			logger,
+		});
+
+		const body = JSON.parse(sent[0]?.input.MessageBody ?? "{}") as {
+			explicitRequest?: boolean;
+		};
+		assert.equal(body.explicitRequest, true);
+	});
+
 	it("does NOT reject when the SQS enqueue fails (POST /sync stays resilient)", async () => {
 		const econnrefused = Object.assign(new Error(""), {
 			name: "AggregateError",

package/src/handlers/sync.ts

@@ -54,6 +54,13 @@ export const triggerSyncSafe = async (
 				sqsClient: deps.sqsClient,
 				queueUrl: deps.queueUrl,
 				accountId,
+				// POST /sync asks for a sync of this account by name — the refresh
+				// control, pull-to-refresh, and the client's automatic poll all land
+				// here — so it syncs every mailbox regardless of how recently one
+				// ran. The poll's cadence is floored client-side at the fan-out
+				// gate's window, so this branch cannot be driven faster than the
+				// gate would allow.
+				explicitRequest: true,
 			});
 			deps.logger.info(
 				{ accountId, eventId },

package/src/handlers/unified-threads.test.ts

@@ -0,0 +1,172 @@
+import assert from "node:assert/strict";
+import { describe, test } from "node:test";
+import type {
+	AccountItem,
+	AccountSettingItem,
+	MailboxItem,
+} from "@remit/data-ports";
+import {
+	buildInboxMailboxMap,
+	buildListAllThreadsOptions,
+	buildListStarredThreadsOptions,
+	type InboxMapClient,
+} from "./unified-threads.js";
+
+// #44: Flagged filtered client-side over the newest 50 unified-inbox rows, so a
+// star outside that window — or in any folder that is not INBOX — never showed.
+// The starred scope is every non-muted mailbox, served by its own access
+// pattern.
+
+const CONFIG_ID = "cfg-1";
+
+const account = (accountId: string): AccountItem =>
+	({ accountId }) as unknown as AccountItem;
+
+const mailbox = (
+	mailboxId: string,
+	accountId: string,
+	fullPath: string,
+	specialUse?: string[],
+): MailboxItem =>
+	({ mailboxId, accountId, fullPath, specialUse }) as unknown as MailboxItem;
+
+const mutedSetting = (
+	name: "AccountMuted" | "MailboxMuted",
+	targetId: string,
+): AccountSettingItem =>
+	({
+		name: `${name}#${targetId}`,
+		value: { kind: "MutedFlag", value: { value: true, setAt: 0 } },
+	}) as unknown as AccountSettingItem;
+
+const buildClient = (
+	accounts: AccountItem[],
+	mailboxesByAccount: Record<string, MailboxItem[]>,
+	settings: AccountSettingItem[] = [],
+): InboxMapClient =>
+	({
+		account: { listAllByAccountConfig: async () => accounts },
+		mailbox: {
+			listAllByAccount: async (accountId: string) =>
+				mailboxesByAccount[accountId] ?? [],
+		},
+		accountSetting: { listByAccountConfig: async () => settings },
+	}) as unknown as InboxMapClient;
+
+describe("buildInboxMailboxMap", () => {
+	test("separates the INBOX scope from the wider starred scope", async () => {
+		const client = buildClient([account("a1")], {
+			a1: [
+				mailbox("m-inbox", "a1", "INBOX"),
+				mailbox("m-archive", "a1", "Archive", ["Archive"]),
+				mailbox("m-sub", "a1", "INBOX/Receipts"),
+			],
+		});
+
+		const { inboxMailboxIds, starredMailboxIds, mailboxIdToAccountId } =
+			await buildInboxMailboxMap(CONFIG_ID, client);
+
+		assert.deepEqual([...inboxMailboxIds], ["m-inbox"]);
+		assert.deepEqual([...starredMailboxIds].sort(), [
+			"m-archive",
+			"m-inbox",
+			"m-sub",
+		]);
+		// The map must cover every mailbox, or a starred row from Archive could
+		// not resolve its accountId.
+		assert.equal(mailboxIdToAccountId.get("m-archive"), "a1");
+	});
+
+	// A star on mail in Spam or Trash is not something the starred view should
+	// resurface; Gmail's All Mail is a second copy of everything, so including it
+	// renders every starred Gmail message twice.
+	test("the starred scope excludes All Mail, Junk and Trash", async () => {
+		const client = buildClient([account("a1")], {
+			a1: [
+				mailbox("m-inbox", "a1", "INBOX"),
+				mailbox("m-all", "a1", "[Gmail]/All Mail", ["All"]),
+				mailbox("m-junk", "a1", "[Gmail]/Spam", ["Junk"]),
+				mailbox("m-trash", "a1", "[Gmail]/Trash", ["Trash"]),
+				mailbox("m-sent", "a1", "[Gmail]/Sent Mail", ["Sent"]),
+			],
+		});
+
+		const { starredMailboxIds, mailboxIdToAccountId } =
+			await buildInboxMailboxMap(CONFIG_ID, client);
+
+		assert.deepEqual([...starredMailboxIds].sort(), ["m-inbox", "m-sent"]);
+		// Excluded mailboxes still resolve an accountId — the map is the wider set.
+		assert.equal(mailboxIdToAccountId.get("m-trash"), "a1");
+	});
+
+	test("a mailbox carrying several special uses is excluded on any one of them", async () => {
+		const client = buildClient([account("a1")], {
+			a1: [mailbox("m-archive-all", "a1", "Archive", ["Archive", "All"])],
+		});
+
+		const { starredMailboxIds } = await buildInboxMailboxMap(CONFIG_ID, client);
+		assert.equal(starredMailboxIds.size, 0);
+	});
+
+	test("muted mailboxes are excluded from both scopes", async () => {
+		const client = buildClient(
+			[account("a1")],
+			{
+				a1: [
+					mailbox("m-inbox", "a1", "INBOX"),
+					mailbox("m-muted", "a1", "Archive"),
+				],
+			},
+			[mutedSetting("MailboxMuted", "m-muted")],
+		);
+
+		const { inboxMailboxIds, starredMailboxIds } = await buildInboxMailboxMap(
+			CONFIG_ID,
+			client,
+		);
+
+		assert.deepEqual([...inboxMailboxIds], ["m-inbox"]);
+		assert.deepEqual([...starredMailboxIds], ["m-inbox"]);
+	});
+
+	test("a muted account contributes no mailboxes", async () => {
+		const client = buildClient(
+			[account("a1")],
+			{ a1: [mailbox("m-inbox", "a1", "INBOX")] },
+			[mutedSetting("AccountMuted", "a1")],
+		);
+
+		const { starredMailboxIds } = await buildInboxMailboxMap(CONFIG_ID, client);
+		assert.equal(starredMailboxIds.size, 0);
+	});
+});
+
+describe("buildListStarredThreadsOptions", () => {
+	test("scopes to every supplied mailbox, not just the inbox", () => {
+		const options = buildListStarredThreadsOptions(
+			{},
+			new Set(["m-inbox", "m-archive"]),
+		);
+
+		assert.deepEqual([...options.mailboxIds].sort(), ["m-archive", "m-inbox"]);
+		assert.equal(options.order, "desc");
+		assert.equal(options.excludeDeleted, true);
+	});
+
+	test("carries the caller's paging through", () => {
+		const options = buildListStarredThreadsOptions(
+			{ continuationToken: "tok", order: "asc", limit: 10 },
+			new Set(["m-inbox"]),
+		);
+
+		assert.equal(options.continuationToken, "tok");
+		assert.equal(options.order, "asc");
+		assert.equal(options.limit, 10);
+	});
+
+	test("defaults the page size to the unified default", () => {
+		const starred = buildListStarredThreadsOptions({}, new Set(["m-inbox"]));
+		const unified = buildListAllThreadsOptions({}, new Set(["m-inbox"]));
+		assert.equal(starred.limit, unified.limit);
+	});
+});

package/src/handlers/unified-threads.ts

@@ -3,6 +3,7 @@ import type {
 	IAccountSettingRepository,
 	MailboxItem,
 } from "@remit/data-ports";
+import { MailboxSpecialUse } from "@remit/domain-enums";
 import type { APIGatewayProxyEvent } from "aws-lambda";
 import type { Context } from "openapi-backend";
 import pMap from "p-map";
@@ -34,8 +35,34 @@ export interface InboxMapClient {
 }
 
 /**
- * Build a mailboxId→accountId map for all non-muted INBOX mailboxes across
- * all non-muted accounts of a given accountConfigId.
+ * Special-use folders a star never surfaces from.
+ *
+ * `Junk` and `Trash` match what Gmail and Fastmail do — a star on mail the user
+ * already threw away or that was classed as spam is not something the starred
+ * view should resurface. `All` is Gmail's All Mail: a second copy of everything
+ * already reachable through its own folder, and because a message's identity
+ * includes its mailbox, the copy is a distinct row carrying the same
+ * server-side \Flagged. Including it would render every starred Gmail message
+ * twice.
+ */
+const STARRED_EXCLUDED_SPECIAL_USE: readonly string[] = [
+	MailboxSpecialUse.All,
+	MailboxSpecialUse.Junk,
+	MailboxSpecialUse.Trash,
+];
+
+const isExcludedFromStarred = (mailbox: MailboxItem): boolean =>
+	mailbox.specialUse?.some((use) =>
+		STARRED_EXCLUDED_SPECIAL_USE.includes(use),
+	) === true;
+
+/**
+ * Build the read scope for the unified listing: a mailboxId→accountId map over
+ * every non-muted mailbox of every non-muted account in a given
+ * accountConfigId, plus two id sets — `inboxMailboxIds` (top-level INBOX only,
+ * the unified inbox scope) and `starredMailboxIds` (every folder a star may
+ * surface from, see `STARRED_EXCLUDED_SPECIAL_USE`). The map covers all
+ * mailboxes, excluded ones included, so any row still resolves its accountId.
  *
  * INBOX is identified by exact match `fullPath.toUpperCase() === "INBOX"` —
  * MailboxSpecialUse has no Inbox value per RFC 6154. This is the same rule
@@ -67,6 +94,7 @@ export const buildInboxMailboxMap = async (
 ): Promise<{
 	mailboxIdToAccountId: Map<string, string>;
 	inboxMailboxIds: Set<string>;
+	starredMailboxIds: Set<string>;
 }> => {
 	const [accounts, settings] = await Promise.all([
 		client.account.listAllByAccountConfig(accountConfigId),
@@ -94,21 +122,23 @@ export const buildInboxMailboxMap = async (
 
 	const mailboxIdToAccountId = new Map<string, string>();
 	const inboxMailboxIds = new Set<string>();
+	const starredMailboxIds = new Set<string>();
 
-	const inboxes = mailboxLists
+	const activeMailboxes = mailboxLists
 		.flat()
-		.filter(
-			(mailbox) =>
-				!isMailboxMuted(mailbox.mailboxId) &&
-				mailbox.fullPath.toUpperCase() === "INBOX",
-		);
+		.filter((mailbox) => !isMailboxMuted(mailbox.mailboxId));
 
-	for (const mailbox of inboxes) {
+	for (const mailbox of activeMailboxes) {
 		mailboxIdToAccountId.set(mailbox.mailboxId, mailbox.accountId);
-		inboxMailboxIds.add(mailbox.mailboxId);
+		if (!isExcludedFromStarred(mailbox)) {
+			starredMailboxIds.add(mailbox.mailboxId);
+		}
+		if (mailbox.fullPath.toUpperCase() === "INBOX") {
+			inboxMailboxIds.add(mailbox.mailboxId);
+		}
 	}
 
-	return { mailboxIdToAccountId, inboxMailboxIds };
+	return { mailboxIdToAccountId, inboxMailboxIds, starredMailboxIds };
 };
 
 /**
@@ -134,6 +164,28 @@ export const buildListAllThreadsOptions = (
 	excludeDeleted: true,
 });
 
+/**
+ * Build listByStarred options for the starred (`starred=true`) listing.
+ *
+ * A star marks the mail, not its placement, so the INBOX narrowing does not
+ * apply: the scope is every non-muted mailbox except the ones a star never
+ * surfaces from. Same defaults as the unified listing otherwise.
+ */
+export const buildListStarredThreadsOptions = (
+	query: {
+		continuationToken?: string;
+		order?: "asc" | "desc";
+		limit?: number;
+	},
+	starredMailboxIds: Set<string>,
+) => ({
+	order: query.order ?? ("desc" as const),
+	continuationToken: query.continuationToken,
+	limit: query.limit ?? DEFAULT_UNIFIED_THREADS_PAGE_SIZE,
+	mailboxIds: starredMailboxIds,
+	excludeDeleted: true,
+});
+
 /**
  * Attach accountId to each enriched ThreadMessageResponse row using the
  * mailboxId→accountId map built from inbox discovery. Same read-time-attach
@@ -158,28 +210,40 @@ export const UnifiedThreadOperations: Record<
 	) => {
 		const event = args[0] as APIGatewayProxyEvent;
 		const accountConfigId = getAccountConfigIdFromEvent(event);
-		const { continuationToken, order, limit } = context.request.query as {
+		const { continuationToken, order, limit, starred } = context.request
+			.query as {
 			continuationToken?: string;
 			order?: "asc" | "desc";
 			limit?: number;
+			starred?: boolean | string;
 		};
+		const starredOnly = starred === true || starred === "true";
 
 		const client = await getClient();
 
-		const { mailboxIdToAccountId, inboxMailboxIds } =
+		const { mailboxIdToAccountId, inboxMailboxIds, starredMailboxIds } =
 			await buildInboxMailboxMap(accountConfigId, client);
 
-		if (inboxMailboxIds.size === 0) {
+		const scope = starredOnly ? starredMailboxIds : inboxMailboxIds;
+		if (scope.size === 0) {
 			return { items: [], continuationToken: undefined };
 		}
 
-		const result = await client.threadMessage.listByDate(
-			accountConfigId,
-			buildListAllThreadsOptions(
-				{ continuationToken, order, limit },
-				inboxMailboxIds,
-			),
-		);
+		const result = starredOnly
+			? await client.threadMessage.listByStarred(
+					accountConfigId,
+					buildListStarredThreadsOptions(
+						{ continuationToken, order, limit },
+						starredMailboxIds,
+					),
+				)
+			: await client.threadMessage.listByDate(
+					accountConfigId,
+					buildListAllThreadsOptions(
+						{ continuationToken, order, limit },
+						inboxMailboxIds,
+					),
+				);
 
 		const enriched = await enrichThreadRows(
 			result.items,

package/src/service/trigger-sync.test.ts

@@ -2,7 +2,6 @@ import assert from "node:assert/strict";
 import { describe, it } from "node:test";
 import { SendMessageCommand, type SQSClient } from "@aws-sdk/client-sqs";
 import {
-	buildManualSyncDedupId,
 	buildScheduledSyncDedupId,
 	buildSyncMailboxesCommand,
 	triggerAccountSync,
@@ -29,20 +28,62 @@ describe("buildSyncMailboxesCommand", () => {
 		assert.equal(cmd.input.MessageGroupId, "account-abc");
 	});
 
-	it("defaults MessageDeduplicationId to the time-bucketed manual dedup id for FIFO queues", () => {
+	it("defaults MessageDeduplicationId to the event's own id for FIFO queues", () => {
 		const cmd = buildSyncMailboxesCommand({
 			sqsClient: {} as SQSClient,
 			queueUrl: FIFO_QUEUE_URL,
 			accountId: "account-abc",
 		});
 
-		assert.ok(
-			cmd.input.MessageDeduplicationId?.startsWith(
-				"SYNC_MAILBOXES:manual:account-abc:",
-			),
+		assert.equal(cmd.input.MessageDeduplicationId, parseBody(cmd).eventId);
+	});
+
+	// Issue #37: a shared, time-bucketed dedup id let SQS FIFO's 5-minute
+	// window discard the second sync of an account, so mail that arrived after
+	// a sync stayed invisible until the window elapsed. Back-to-back triggers
+	// must each reach the queue.
+	it("gives two triggers for one account distinct dedup ids", () => {
+		const first = buildSyncMailboxesCommand({
+			sqsClient: {} as SQSClient,
+			queueUrl: FIFO_QUEUE_URL,
+			accountId: "account-abc",
+		});
+		const second = buildSyncMailboxesCommand({
+			sqsClient: {} as SQSClient,
+			queueUrl: FIFO_QUEUE_URL,
+			accountId: "account-abc",
+		});
+
+		assert.notEqual(
+			first.input.MessageDeduplicationId,
+			second.input.MessageDeduplicationId,
 		);
 	});
 
+	// The worker's fan-out gate reads this off the event: it is what lets a
+	// sync asked for by name cover every folder while a side-effect trigger
+	// skips the ones that were just enumerated.
+	it("marks an explicitly-requested trigger on the event", () => {
+		const cmd = buildSyncMailboxesCommand({
+			sqsClient: {} as SQSClient,
+			queueUrl: FIFO_QUEUE_URL,
+			accountId: "account-abc",
+			explicitRequest: true,
+		});
+
+		assert.equal(parseBody(cmd).explicitRequest, true);
+	});
+
+	it("leaves a side-effect trigger unmarked", () => {
+		const cmd = buildSyncMailboxesCommand({
+			sqsClient: {} as SQSClient,
+			queueUrl: FIFO_QUEUE_URL,
+			accountId: "account-abc",
+		});
+
+		assert.equal(parseBody(cmd).explicitRequest, undefined);
+	});
+
 	it("does not set FIFO params for standard queues", () => {
 		const cmd = buildSyncMailboxesCommand({
 			sqsClient: {} as SQSClient,
@@ -93,43 +134,6 @@ describe("buildSyncMailboxesCommand", () => {
 	});
 });
 
-describe("buildManualSyncDedupId", () => {
-	const SIXTY_SECONDS_MS = 60 * 1000;
-
-	it("is stable within the same time bucket (dedupes a rapid double-tap)", () => {
-		const bucketStart = 10 * SIXTY_SECONDS_MS;
-
-		const first = buildManualSyncDedupId("account-abc", bucketStart);
-		const second = buildManualSyncDedupId("account-abc", bucketStart + 1_000);
-
-		assert.equal(first, second);
-	});
-
-	it("changes across a bucket boundary (never dedupes two polls a minute apart)", () => {
-		const bucketStart = 10 * SIXTY_SECONDS_MS;
-
-		const thisTrigger = buildManualSyncDedupId("account-abc", bucketStart);
-		const nextTrigger = buildManualSyncDedupId(
-			"account-abc",
-			bucketStart + SIXTY_SECONDS_MS,
-		);
-
-		assert.notEqual(thisTrigger, nextTrigger);
-	});
-
-	it("never collides with the scheduler's dedup namespace", () => {
-		const now = 10 * SIXTY_SECONDS_MS;
-		const manual = buildManualSyncDedupId("account-abc", now);
-		const scheduled = buildScheduledSyncDedupId(
-			"account-abc",
-			now,
-			SIXTY_SECONDS_MS,
-		);
-
-		assert.notEqual(manual, scheduled);
-	});
-});
-
 describe("buildScheduledSyncDedupId", () => {
 	const FIVE_MINUTES_MS = 5 * 60 * 1000;
 

package/src/service/trigger-sync.ts

@@ -6,6 +6,7 @@ interface SyncMailboxesEvent {
 	eventId: string;
 	timestamp: number;
 	accountId: string;
+	explicitRequest?: boolean;
 }
 
 interface TriggerAccountSyncInput {
@@ -13,45 +14,42 @@ interface TriggerAccountSyncInput {
 	queueUrl: string;
 	accountId: string;
 	/**
-	 * Override the FIFO `MessageDeduplicationId`. Defaults to a time-bucketed
-	 * manual-trigger id (`buildManualSyncDedupId`) shared by every manual call
-	 * site (POST /sync, OAuth connect, config load, pull-to-refresh, the
-	 * client's online-poll) so a rapid double-tap collapses into one enqueue,
-	 * while distinct triggers a bucket or more apart always pass through.
+	 * Set by POST /sync, whose callers ask for a sync of one named account: the
+	 * refresh control, pull-to-refresh, and the web client's automatic poll
+	 * (`useStaleAccountSync`) — a timer, not a person. It travels on the event
+	 * and makes the worker's fan-out sync every mailbox even if one just ran.
 	 *
-	 * The scheduled-sync tick (#1247) must NOT share that namespace: pass
-	 * `buildScheduledSyncDedupId()` here instead, so the two paths can never
-	 * suppress each other.
+	 * Everything else triggers a sync as a side effect of doing something else
+	 * (config load, OAuth connect, account create, the scheduled tick), leaves
+	 * this unset, and takes the freshness gate — see `mailboxNeedsSync` in
+	 * imap-worker's sync-mailboxes handler.
+	 *
+	 * The poll cannot use this to outrun the gate: its interval is floored at
+	 * the gate's own window (`MIN_POLL_INTERVAL_MS` in the client hook), so
+	 * however low `mailboxPollIntervalSeconds` is set, a timer never fans out
+	 * more often than the gate would have allowed anyway.
+	 */
+	explicitRequest?: boolean;
+	/**
+	 * Override the FIFO `MessageDeduplicationId`. Defaults to the event's own
+	 * id, so the queue suppresses a re-send of one event and nothing else —
+	 * every manual call site (POST /sync, OAuth connect, config load,
+	 * pull-to-refresh, the client's online-poll) always enqueues. A shared,
+	 * time-bucketed id instead turned SQS's 5-minute window into a rate limiter
+	 * and silently discarded a sync the user asked for whenever one had run
+	 * recently (issue #37). What a trigger costs is bounded in the worker's
+	 * fan-out (`mailboxNeedsSync`), by skipping mailboxes not worth
+	 * re-enumerating — never by dropping the trigger.
+	 *
+	 * The scheduled-sync tick (#1247) passes `buildScheduledSyncDedupId()`,
+	 * which is bucketed by the tick's own cadence: there it collapses a
+	 * re-invocation of a single tick, never two ticks or a manual trigger.
 	 */
 	dedupId?: string;
 }
 
 const isFifoQueue = (queueUrl: string): boolean => queueUrl.endsWith(".fifo");
 
-/**
- * Bucket window for the manual-trigger dedup id. SQS FIFO's own dedup window
- * is 5 minutes; a static per-account id (the pre-#1250 behaviour) collided
- * with the client's 5-minute online poll and swallowed a pull-to-refresh
- * within 5 minutes of any prior trigger. Bucketing to ~60s keeps a rapid
- * double-tap deduped while letting distinct polls a minute or more apart
- * always enqueue.
- */
-const MANUAL_DEDUP_BUCKET_MS = 60_000;
-
-/**
- * Build the manual-trigger dedup id (POST /sync, OAuth connect, config load,
- * pull-to-refresh, client online-poll), bucketed so consecutive triggers a
- * bucket apart never collide — see `dedupId` above.
- */
-export const buildManualSyncDedupId = (
-	accountId: string,
-	now: number,
-	bucketMs: number = MANUAL_DEDUP_BUCKET_MS,
-): string => {
-	const bucket = Math.floor(now / bucketMs);
-	return `SYNC_MAILBOXES:manual:${accountId}:${bucket}`;
-};
-
 /**
  * Build the scheduler's own dedup namespace, bucketed by tick interval so
  * consecutive ticks each get a fresh id (never colliding with each other)
@@ -70,12 +68,13 @@ export const buildScheduledSyncDedupId = (
 export const buildSyncMailboxesCommand = (
 	input: TriggerAccountSyncInput,
 ): SendMessageCommand => {
-	const { queueUrl, accountId, dedupId } = input;
+	const { queueUrl, accountId, dedupId, explicitRequest } = input;
 	const event: SyncMailboxesEvent = {
 		type: "SYNC_MAILBOXES",
 		eventId: randomUUID(),
 		timestamp: Date.now(),
 		accountId,
+		...(explicitRequest && { explicitRequest }),
 	};
 
 	const useFifo = isFifoQueue(queueUrl);
@@ -85,8 +84,7 @@ export const buildSyncMailboxesCommand = (
 		MessageBody: JSON.stringify(event),
 		...(useFifo && {
 			MessageGroupId: accountId,
-			MessageDeduplicationId:
-				dedupId ?? buildManualSyncDedupId(accountId, event.timestamp),
+			MessageDeduplicationId: dedupId ?? event.eventId,
 		}),
 	});
 };