@remit/mailbox-service 0.0.101 → 0.0.103

package/src/classification-backfill.ts

@@ -1,5 +1,6 @@
 import type {
 	IAccountConfigRepository,
+	IAccountRepository,
 	IAddressRepository,
 	IMessageRepository,
 	IThreadMessageRepository,
@@ -11,6 +12,11 @@ import { parseMessageBody } from "./body-parse.js";
 import { extractSnippet } from "./body-sync.js";
 import { classifyParsedMessage } from "./classify-message.js";
 import { extractListId } from "./filters/list-id.js";
+import {
+	type FolderPlacementLookup,
+	resolveAccountFolderPlacements,
+} from "./folder-placement.js";
+import type { FolderPlacement } from "./heuristics/classifyPlacement.js";
 import {
 	denormalizeMessageCategory,
 	hasDecidedCategory,
@@ -44,6 +50,8 @@ export interface ClassificationBackfillCheckpointStore {
 
 export interface ClassificationBackfillDeps {
 	accountConfigService: Pick<IAccountConfigRepository, "listAll">;
+	accountService: Pick<IAccountRepository, "listAllByAccountConfig">;
+	mailboxSpecialUseService: FolderPlacementLookup;
 	/** Reads the sender's `Address.flags.category` override (issue #299). */
 	addressService: Pick<IAddressRepository, "getAddress">;
 	threadMessageService: Pick<
@@ -116,6 +124,7 @@ const classifyAndApply = async (
 	accountConfigId: string,
 	row: ThreadMessageItem,
 	bodyStorageKey: string,
+	placement: FolderPlacement,
 ): Promise<void> => {
 	const body = await deps.storageService.retrieve(bodyStorageKey);
 	const parsed = await parseMessageBody(body);
@@ -123,6 +132,7 @@ const classifyAndApply = async (
 		deps.addressService,
 		accountConfigId,
 		parsed,
+		placement,
 	);
 
 	// The same denormalized fields the body-store path writes (see
@@ -223,6 +233,13 @@ export const backfillClassifications = async (
 		const account = accounts[accountIndex];
 		let continuationToken: string | undefined =
 			accountIndex === startIndex ? startContinuationToken : undefined;
+		const mailAccounts = await deps.accountService.listAllByAccountConfig(
+			account.accountConfigId,
+		);
+		const placements = await resolveAccountFolderPlacements(
+			deps.mailboxSpecialUseService,
+			mailAccounts.map((mailAccount) => mailAccount.accountId),
+		);
 
 		do {
 			const page = await deps.threadMessageService.listByAccount(
@@ -297,6 +314,7 @@ export const backfillClassifications = async (
 						account.accountConfigId,
 						row,
 						message.bodyStorageKey,
+						placements.get(row.mailboxId) ?? "other",
 					).then(
 						() => null,
 						(error: unknown) => error,

package/src/classify-message.test.ts

@@ -13,6 +13,7 @@ import assert from "node:assert/strict";
 import { describe, it } from "node:test";
 import type { AddressItem, IAddressRepository } from "@remit/data-ports";
 import { NotFoundError } from "@remit/data-ports/errors";
+import { DisplayNameCorrespondence } from "@remit/domain-enums";
 import { parseMessageBody } from "./body-parse.js";
 import {
 	classifyParsedMessage,
@@ -43,6 +44,18 @@ const LIST_EML = Buffer.from(
 	].join("\r\n"),
 );
 
+const IMPERSONATION_EML = Buffer.from(
+	[
+		"From: InfoMedics <billing@serviceupdatebank.atlassian.net>",
+		"To: me@example.com",
+		"Subject: Openstaande factuur",
+		"DKIM-Signature: v=1; a=rsa-sha256; d=atlassian.net; s=sel; b=xxx",
+		"Content-Type: text/html",
+		"",
+		'<a href="https://betaal-vordering.example.org/pay">Betaal uw factuur</a>',
+	].join("\r\n"),
+);
+
 const addressService = (
 	behavior: (accountConfigId: string, addressId: string) => unknown,
 ): Pick<IAddressRepository, "getAddress"> => ({
@@ -68,6 +81,7 @@ describe("classifyParsedMessage", () => {
 			}),
 			"acc-1",
 			parsed,
+			"inbox",
 		);
 
 		assert.equal(classification.category, "newsletter");
@@ -81,6 +95,7 @@ describe("classifyParsedMessage", () => {
 			addressService(withFlags({ category: { value: "marketing", setAt: 1 } })),
 			"acc-1",
 			parsed,
+			"inbox",
 		);
 
 		// The header table alone would answer `personal`; the override wins
@@ -98,6 +113,7 @@ describe("classifyParsedMessage", () => {
 				}),
 				"acc-1",
 				parsed,
+				"inbox",
 			),
 			/throttled/,
 		);
@@ -124,6 +140,7 @@ describe("classifyParsedMessage", () => {
 			}),
 			"acc-1",
 			parsed,
+			"inbox",
 		);
 
 		assert.equal(reads, 0);
@@ -131,6 +148,48 @@ describe("classifyParsedMessage", () => {
 	});
 });
 
+describe("classifyParsedMessage sender mismatch", () => {
+	const noAddress = addressService(async () => {
+		throw new NotFoundError("no Address row");
+	});
+
+	it("compares the sender of mail in Junk the provider rated clean", async () => {
+		const parsed = await parseMessageBody(IMPERSONATION_EML);
+
+		const classification = await classifyParsedMessage(
+			noAddress,
+			"acc-1",
+			parsed,
+			"junk",
+		);
+
+		assert.equal(
+			classification.authenticity?.displayNameCorrespondence,
+			DisplayNameCorrespondence.Unrelated,
+		);
+		assert.deepEqual(classification.authenticity?.offDomainLinkDomains, [
+			"example.org",
+		]);
+	});
+
+	it("compares nothing for the same mail outside Junk without a provider verdict", async () => {
+		const parsed = await parseMessageBody(IMPERSONATION_EML);
+
+		const classification = await classifyParsedMessage(
+			noAddress,
+			"acc-1",
+			parsed,
+			"inbox",
+		);
+
+		assert.equal(
+			classification.authenticity?.displayNameCorrespondence,
+			undefined,
+		);
+		assert.equal(classification.authenticity?.offDomainLinkDomains, undefined);
+	});
+});
+
 describe("extractPrimaryFromEmail", () => {
 	it("reads the first From address", async () => {
 		const parsed = await parseMessageBody(PLAIN_EML);

package/src/classify-message.ts

@@ -13,6 +13,7 @@ import {
 	extractHasListUnsubscribe,
 	extractProviderSpam,
 } from "./heuristics/classifyByHeaders.js";
+import type { FolderPlacement } from "./heuristics/classifyPlacement.js";
 import { extractSenderMismatch } from "./heuristics/senderMismatch.js";
 
 type ThreadMessageCategory = ThreadMessageItem["category"];
@@ -75,6 +76,7 @@ export const classifyParsedMessage = async (
 	addressService: Pick<IAddressRepository, "getAddress">,
 	accountConfigId: string,
 	parsed: ParsedMail,
+	placement: FolderPlacement,
 ): Promise<UpdateMessageInput & { category: ThreadMessageCategory }> => {
 	const headerCategory = classifyByHeaders(parsed);
 	const authenticity = extractAuthenticity(parsed);
@@ -86,13 +88,14 @@ export const classifyParsedMessage = async (
 	// identity the message claims — on a shared-tenant host the verified
 	// subdomain belongs to whoever signed up. These two comparisons say
 	// whether the claim holds, and run only over mail the provider already
-	// called spam.
+	// called spam or that sits in the Junk folder.
 	const senderMismatch =
 		authenticity === null
 			? {}
 			: extractSenderMismatch(parsed, {
 					fromDomain: authenticity.fromDomain,
-					spamClassified: providerSpam?.classified === true,
+					providerSpamClassified: providerSpam?.classified === true,
+					placement,
 					bulkSender: hasListUnsubscribe,
 				});
 

package/src/folder-placement.ts

@@ -0,0 +1,56 @@
+import type { IMailboxSpecialUseRepository } from "@remit/data-ports";
+import type { FolderPlacement } from "./heuristics/classifyPlacement.js";
+
+export type FolderPlacementLookup = Pick<
+	IMailboxSpecialUseRepository,
+	"findJunkMailbox" | "findInboxMailbox"
+>;
+
+type RoleMailbox = Awaited<
+	ReturnType<IMailboxSpecialUseRepository["findJunkMailbox"]>
+>;
+
+export interface FolderRoleMailboxes {
+	junkMailbox: RoleMailbox;
+	inboxMailbox: RoleMailbox;
+}
+
+export const resolveFolderRoleMailboxes = async (
+	lookup: FolderPlacementLookup,
+	accountId: string,
+): Promise<FolderRoleMailboxes> => ({
+	junkMailbox: await lookup.findJunkMailbox(accountId),
+	inboxMailbox: await lookup.findInboxMailbox(accountId),
+});
+
+export const placementOf = (
+	mailboxId: string,
+	{ junkMailbox, inboxMailbox }: FolderRoleMailboxes,
+): FolderPlacement => {
+	if (junkMailbox?.mailboxId === mailboxId) return "junk";
+	if (inboxMailbox?.mailboxId === mailboxId) return "inbox";
+	return "other";
+};
+
+export const resolveFolderPlacement = async (
+	lookup: FolderPlacementLookup,
+	accountId: string,
+	mailboxId: string,
+): Promise<FolderPlacement> =>
+	placementOf(mailboxId, await resolveFolderRoleMailboxes(lookup, accountId));
+
+export const resolveAccountFolderPlacements = async (
+	lookup: FolderPlacementLookup,
+	accountIds: readonly string[],
+): Promise<ReadonlyMap<string, FolderPlacement>> => {
+	const placements = new Map<string, FolderPlacement>();
+	for (const accountId of accountIds) {
+		const { junkMailbox, inboxMailbox } = await resolveFolderRoleMailboxes(
+			lookup,
+			accountId,
+		);
+		if (inboxMailbox) placements.set(inboxMailbox.mailboxId, "inbox");
+		if (junkMailbox) placements.set(junkMailbox.mailboxId, "junk");
+	}
+	return placements;
+};

package/src/heuristics/senderMismatch.test.ts

@@ -245,7 +245,8 @@ describe("extractSenderMismatch", () => {
 		assert.deepEqual(
 			extractSenderMismatch(parsed, {
 				fromDomain: "serviceupdatebank.atlassian.net",
-				spamClassified: true,
+				providerSpamClassified: true,
+				placement: "other",
 				bulkSender: false,
 			}),
 			{
@@ -255,18 +256,53 @@ describe("extractSenderMismatch", () => {
 		);
 	});
 
-	it("compares nothing when the provider did not call the message spam", async () => {
+	it("flags a message sitting in Junk that the provider rated clean", async () => {
 		const parsed = await parse(infoMedicsPhish);
 		assert.deepEqual(
 			extractSenderMismatch(parsed, {
 				fromDomain: "serviceupdatebank.atlassian.net",
-				spamClassified: false,
+				providerSpamClassified: false,
+				placement: "junk",
 				bulkSender: false,
 			}),
-			{},
+			{
+				displayNameCorrespondence: DisplayNameCorrespondence.Unrelated,
+				offDomainLinkDomains: ["example.org"],
+			},
 		);
 	});
 
+	it("flags a provider-classified message outside Junk", async () => {
+		const parsed = await parse(infoMedicsPhish);
+		assert.deepEqual(
+			extractSenderMismatch(parsed, {
+				fromDomain: "serviceupdatebank.atlassian.net",
+				providerSpamClassified: true,
+				placement: "inbox",
+				bulkSender: false,
+			}),
+			{
+				displayNameCorrespondence: DisplayNameCorrespondence.Unrelated,
+				offDomainLinkDomains: ["example.org"],
+			},
+		);
+	});
+
+	for (const placement of ["inbox", "other"] as const) {
+		it(`compares nothing in ${placement} when the provider did not call the message spam`, async () => {
+			const parsed = await parse(infoMedicsPhish);
+			assert.deepEqual(
+				extractSenderMismatch(parsed, {
+					fromDomain: "serviceupdatebank.atlassian.net",
+					providerSpamClassified: false,
+					placement,
+					bulkSender: false,
+				}),
+				{},
+			);
+		});
+	}
+
 	it("flags a display name spelling the recipient's own address over a foreign domain", async () => {
 		const parsed = await parse([
 			"From: matthijs@ischen.nl <aramirez@secresaludguaviare.gov.co>",
@@ -279,7 +315,8 @@ describe("extractSenderMismatch", () => {
 		assert.equal(
 			extractSenderMismatch(parsed, {
 				fromDomain: "secresaludguaviare.gov.co",
-				spamClassified: true,
+				providerSpamClassified: true,
+				placement: "other",
 				bulkSender: false,
 			}).displayNameCorrespondence,
 			DisplayNameCorrespondence.ForeignAddress,
@@ -299,7 +336,8 @@ describe("extractSenderMismatch", () => {
 		]);
 		const signals = extractSenderMismatch(parsed, {
 			fromDomain: "mailer.esp.example",
-			spamClassified: true,
+			providerSpamClassified: true,
+			placement: "other",
 			bulkSender: true,
 		});
 		assert.equal(signals.displayNameCorrespondence, undefined);

package/src/heuristics/senderMismatch.ts

@@ -1,6 +1,7 @@
 import { DisplayNameCorrespondence } from "@remit/domain-enums";
 import type { ParsedMail } from "mailparser";
 import { getDomain, parse as parseHost } from "tldts";
+import type { FolderPlacement } from "./classifyPlacement.js";
 
 type CorrespondenceValue =
 	(typeof DisplayNameCorrespondence)[keyof typeof DisplayNameCorrespondence];
@@ -10,7 +11,8 @@ type CorrespondenceValue =
  * that belongs to nobody at the sending domain, and body links that leave it.
  *
  * Both are deliberately aggressive, and both are computed only for mail the
- * provider's own filter already called spam (see {@link extractSenderMismatch}).
+ * provider's own filter already called spam or that sits in the Junk folder
+ * (see {@link extractSenderMismatch}).
  * On a shared-tenant host — a free Atlassian, Salesforce or Zendesk instance —
  * the verified subdomain is chosen by whoever signed up, so a passing signature
  * proves the domain and nothing about the identity the message claims.
@@ -22,7 +24,8 @@ export interface SenderMismatchSignals {
 
 export interface SenderMismatchContext {
 	fromDomain: string;
-	spamClassified: boolean;
+	providerSpamClassified: boolean;
+	placement: FolderPlacement;
 	/**
 	 * List-Unsubscribe present. Bulk mail routinely shows a brand name over an
 	 * ESP's sending domain, so the display-name comparison says nothing there and
@@ -223,7 +226,8 @@ export const extractOffDomainLinkDomains = (
 };
 
 /**
- * Both signals, gated on the provider's own spam verdict.
+ * Both signals, gated on a spam verdict: the provider's own, or the message
+ * sitting in the Junk folder.
  *
  * The gate is what lets the checks be this aggressive: ordinary mail never
  * reaches them, so a brand name over an ESP domain or a newsletter full of
@@ -234,7 +238,9 @@ export const extractSenderMismatch = (
 	parsed: ParsedMail,
 	context: SenderMismatchContext,
 ): SenderMismatchSignals => {
-	if (!context.spamClassified) return {};
+	if (!context.providerSpamClassified && context.placement !== "junk") {
+		return {};
+	}
 
 	const offDomainLinkDomains = extractOffDomainLinkDomains(
 		parsed,

package/src/index.ts

@@ -25,6 +25,7 @@ export {
 	parseMessageBody,
 } from "./body-parse.js";
 export {
+	type BodySyncFolder,
 	type BodySyncLogger,
 	BodySyncService,
 	type ConnectionGetter,
@@ -125,6 +126,11 @@ export {
 	type UpdateFlagsInput,
 	type UpdateFlagsResult,
 } from "./flag-queue.js";
+export {
+	type FolderPlacementLookup,
+	resolveAccountFolderPlacements,
+	resolveFolderPlacement,
+} from "./folder-placement.js";
 export {
 	classifyByHeaders,
 	extractAuthenticity,

package/src/mailbox-management.test.ts

@@ -2,6 +2,7 @@ import assert from "node:assert";
 import { describe, it } from "node:test";
 import type {
 	IMailboxRepository,
+	MailboxItem,
 	MailboxTransitionIntent,
 } from "@remit/data-ports";
 import { MailboxSyncStatus } from "@remit/domain-enums";
@@ -99,7 +100,10 @@ const boxStatus = (path: string): ImapBoxStatus => ({
 	newKeywords: false,
 });
 
-const recordingRepo = () => {
+const recordingRepo = (
+	held: Pick<MailboxItem, "mailboxId" | "fullPath">[] = [],
+) => {
+	const removed: string[] = [];
 	const updates: Array<{ mailboxId: string; patch: Record<string, unknown> }> =
 		[];
 	const settles: Array<{
@@ -108,7 +112,11 @@ const recordingRepo = () => {
 	}> = [];
 	const repo: Pick<
 		IMailboxRepository,
-		"update" | "transition" | "findByPathPrefix"
+		| "update"
+		| "transition"
+		| "findByPathPrefix"
+		| "findByPath"
+		| "deleteMailboxWithMail"
 	> = {
 		update: async (
 			_accountId: string,
@@ -127,8 +135,13 @@ const recordingRepo = () => {
 			return {} as never;
 		},
 		findByPathPrefix: async () => [],
+		findByPath: async (_accountId: string, fullPath: string) =>
+			(held.find((row) => row.fullPath === fullPath) as MailboxItem) ?? null,
+		deleteMailboxWithMail: async (_accountId: string, mailboxId: string) => {
+			removed.push(mailboxId);
+		},
 	};
-	return { repo: repo as IMailboxRepository, updates, settles };
+	return { repo: repo as IMailboxRepository, updates, settles, removed };
 };
 
 const stubConnection = (
@@ -185,6 +198,38 @@ describe("MailboxManagementService.syncCreate — server path normalization", ()
 		assert.strictEqual(settles[0].intent.to, MailboxSyncStatus.synced);
 	});
 
+	it("drops the pending row when the prefixed path already has a folder (#318)", async () => {
+		const { repo, settles, updates, removed } = recordingRepo([
+			{ mailboxId: "mbx-existing", fullPath: "INBOX/Notifications" },
+		]);
+		const connection = {
+			createMailbox: async (_path: string) => ({
+				path: "INBOX/Notifications",
+				created: false,
+			}),
+			subscribeMailbox: async () => undefined,
+			listMailboxes: async (): Promise<FlatMailboxInfo[]> => [],
+			openBox: async (path: string) => boxStatus(path),
+			closeBox: async () => undefined,
+		} as unknown as IImapConnection;
+		const service = new MailboxManagementService(repo);
+
+		const result = await service.syncCreate(
+			"acc-1",
+			"mbx-recreated",
+			"Notifications",
+			async () => connection,
+		);
+
+		assert.deepStrictEqual(result, {
+			success: true,
+			existing: { mailboxId: "mbx-existing", fullPath: "INBOX/Notifications" },
+		});
+		assert.deepStrictEqual(removed, ["mbx-recreated"]);
+		assert.deepStrictEqual(settles, []);
+		assert.deepStrictEqual(updates, []);
+	});
+
 	it("leaves the path untouched when the server keeps it as requested", async () => {
 		const { repo, settles } = recordingRepo();
 		const { connection } = stubConnection("Work", ["Work"]);

package/src/mailbox-management.ts

@@ -48,6 +48,7 @@ export interface MailboxManagementSyncResult {
 	 * which is how a caller tells the two apart without a second read.
 	 */
 	renamed?: { oldPath: string; newPath: string; delimiter: string };
+	existing?: { mailboxId: string; fullPath: string };
 }
 
 /**
@@ -304,6 +305,30 @@ export class MailboxManagementService {
 			this.log.info({ mailboxId, path: serverPath }, "Subscribed to mailbox");
 		}
 
+		const holder =
+			confirmedPath === undefined
+				? null
+				: await this.mailboxService.findByPath(accountId, confirmedPath);
+		if (holder && holder.mailboxId !== mailboxId) {
+			await this.mailboxService.deleteMailboxWithMail(accountId, mailboxId);
+			this.log.info(
+				{
+					accountId,
+					mailboxId,
+					intent: "create",
+					path,
+					serverPath,
+					existingMailboxId: holder.mailboxId,
+					outcome: "already-exists",
+				},
+				"Folder already exists at the path the server resolved",
+			);
+			return {
+				success: true,
+				existing: { mailboxId: holder.mailboxId, fullPath: holder.fullPath },
+			};
+		}
+
 		// Refresh mailbox list to get UIDVALIDITY and other attributes
 		const mailboxes = await connection.listMailboxes();
 		const mailboxInfo = mailboxes.find((m) => m.fullPath === serverPath);

package/src/mailbox-queue.ts

@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
 import { SendMessageCommand, type SQSClient } from "@aws-sdk/client-sqs";
 import type {
 	CreateMailboxInput,
+	CreateMailboxResult,
 	IMailboxRepository,
 	MailboxItem,
 } from "@remit/data-ports";
@@ -120,18 +121,19 @@ export class MailboxQueueService {
 	 * @param input - The mailbox creation input (without syncStatus)
 	 * @param accountId - The account ID for the IMAP sync event
 	 * @param subscribe - Whether to subscribe to the mailbox after creation
-	 * @returns The created mailbox
+	 * @returns The created mailbox, or `PathTaken` when the account already has a folder at that path
 	 */
 	createMailbox = async (
 		input: CreateMailboxQueueInput,
 		accountId: string,
 		subscribe?: boolean,
-	): Promise<MailboxItem> => {
-		// Create local mailbox with pending status
-		const mailbox = await this.mailboxService.create({
+	): Promise<CreateMailboxResult> => {
+		const created = await this.mailboxService.create({
 			...input,
 			syncStatus: MailboxSyncStatus.pending,
 		});
+		if (created.outcome === "PathTaken") return created;
+		const { mailbox } = created;
 
 		this.log.info(
 			{ mailboxId: mailbox.mailboxId, path: mailbox.fullPath },
@@ -149,7 +151,7 @@ export class MailboxQueueService {
 			subscribe,
 		});
 
-		return mailbox;
+		return created;
 	};
 
 	/**

package/src/mailbox-sync.test.ts

@@ -13,7 +13,11 @@ import {
 import { parseImapAttributes } from "./attribute-mapper.js";
 import { type MailboxSyncLogger, MailboxSyncService } from "./mailbox-sync.js";
 
-const silentLogger: MailboxSyncLogger = { info: () => {}, debug: () => {} };
+const silentLogger: MailboxSyncLogger = {
+	info: () => {},
+	debug: () => {},
+	error: () => {},
+};
 
 import type { IImapConnection, ImapNamespaces } from "./types.js";
 
@@ -110,7 +114,10 @@ describe("MailboxSyncService.syncMailboxes — UIDVALIDITY cursor detection (#12
 				return {};
 			},
 			delete: async () => undefined,
-			create: async () => ({}),
+			create: async () => ({
+				outcome: "Created",
+				mailbox: { mailboxId: "new" },
+			}),
 		} as unknown as IMailboxRepository;
 
 		const specialUseService = {
@@ -257,6 +264,7 @@ describe("MailboxSyncService.syncMailboxes — reconcile does not delete pending
 			syncStatus?: string;
 			pendingPath?: string;
 		}>,
+		createOutcome: "Created" | "PathTaken" = "Created",
 	) => {
 		const deleted: string[] = [];
 		const created: Array<Record<string, unknown>> = [];
@@ -283,7 +291,11 @@ describe("MailboxSyncService.syncMailboxes — reconcile does not delete pending
 			},
 			create: async (input: Record<string, unknown>) => {
 				created.push(input);
-				return { ...input, mailboxId: `new-${created.length}` };
+				if (createOutcome === "PathTaken") return { outcome: "PathTaken" };
+				return {
+					outcome: "Created",
+					mailbox: { ...input, mailboxId: `new-${created.length}` },
+				};
 			},
 		} as unknown as IMailboxRepository;
 
@@ -401,6 +413,35 @@ describe("MailboxSyncService.syncMailboxes — reconcile does not delete pending
 		assert.deepEqual(deleted, []);
 	});
 
+	it("counts no insert and keeps the account sweep going when the path is already taken", async () => {
+		const { mailboxService, specialUseService, created } = buildServices(
+			[
+				{
+					mailboxId: "inbox",
+					fullPath: "INBOX",
+					syncStatus: MailboxSyncStatus.synced,
+				},
+			],
+			"PathTaken",
+		);
+		const errors: Array<Record<string, unknown>> = [];
+		const service = new MailboxSyncService(mailboxService, specialUseService, {
+			...silentLogger,
+			error: (obj) => {
+				errors.push(obj);
+			},
+		});
+
+		const result = await service.syncMailboxes(
+			{ accountId: "acc-1" },
+			serverConnection([{ fullPath: "INBOX" }, { fullPath: "Projects" }]),
+		);
+
+		assert.equal(created.length, 1);
+		assert.equal(result.created, 0);
+		assert.deepEqual(errors, [{ accountId: "acc-1", fullPath: "Projects" }]);
+	});
+
 	it("lets a failed rename's target be discovered as a folder of its own", async () => {
 		// A failed rename keeps its target so the UI can name what it was aiming
 		// at (T6), and nothing clears it until the user retries or dismisses. If
@@ -539,7 +580,10 @@ describe("MailboxSyncService.syncMailboxes — a lookalike is not a folder the u
 			delete: async (_accountId: string, mailboxId: string) => {
 				deleted.push(mailboxId);
 			},
-			create: async () => ({}),
+			create: async () => ({
+				outcome: "Created",
+				mailbox: { mailboxId: "new" },
+			}),
 		} as unknown as IMailboxRepository;
 
 		const specialUseService = {
@@ -717,7 +761,10 @@ describe("MailboxSyncService.syncMailboxes — a folder leaving mid-sweep (#339)
 				return {};
 			},
 			delete: async () => undefined,
-			create: async () => ({}),
+			create: async () => ({
+				outcome: "Created",
+				mailbox: { mailboxId: "new" },
+			}),
 		} as unknown as IMailboxRepository;
 
 		const specialUseService = {