@remit/mailbox-service 0.0.40 → 0.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/mailbox-service",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/body-sync-placement-flags.test.ts

@@ -69,7 +69,7 @@ const MAILBOXES = {
 };
 
 const buildHarness = (
-	message: { messageId: string; mailboxId: string },
+	message: { messageId: string; mailboxId: string; movedByRemit?: boolean },
 	flags: AddressItem["flags"],
 ): Harness => {
 	const moves: MoveCall[] = [];
@@ -79,11 +79,7 @@ const buildHarness = (
 	}> = [];
 
 	const messageService = {
-		get: async () => ({
-			messageId: message.messageId,
-			mailboxId: message.mailboxId,
-			uid: 1,
-		}),
+		get: async () => ({ ...message, uid: 1 }),
 		update: async (messageId: string, input: UpdateMessageInput) => {
 			messageUpdates.push({ messageId, input });
 		},
@@ -300,3 +296,56 @@ describe("Address.flags.autoArchive drives placement (issue #300)", () => {
 		]);
 	});
 });
+
+/**
+ * Issue #398: not every `leave` verdict means "nothing confident to say".
+ * `already-moved-by-remit` is the guard against re-deciding a settled
+ * placement, and mail sitting in Junk gets a `leave` because the demote branch
+ * only fires outside Junk. Auto-archive is a filing preference relative to the
+ * Inbox and must yield to both, so these drive `BodySyncService` end-to-end and
+ * assert on the absence of a move.
+ */
+describe("autoArchive respects a leave verdict that decided something (issue #398)", () => {
+	it("leaves a blocked autoArchive sender's message in Junk", async () => {
+		const harness = buildHarness(
+			{ messageId: "m-1", mailboxId: MAILBOXES.junk.mailboxId },
+			{
+				blocked: { value: true, setAt: 1_000 },
+				autoArchive: { value: true, setAt: 1_000 },
+			},
+		);
+
+		await readBody(harness.service, "Junk");
+
+		assert.deepEqual(harness.moves, []);
+	});
+
+	it("leaves an autoArchive sender's provider-junked message in Junk", async () => {
+		const harness = buildHarness(
+			{ messageId: "m-1", mailboxId: MAILBOXES.junk.mailboxId },
+			{ autoArchive: { value: true, setAt: 1_000 } },
+		);
+
+		// Provider-spam + dmarc-pass from an untrusted sender is an unsure
+		// `leave`: too weak to rescue, and auto-archive is not a second chance
+		// at leaving Junk.
+		await readBody(harness.service, "Junk", SPAM_FLAGGED_DMARC_PASS_EML);
+
+		assert.deepEqual(harness.moves, []);
+	});
+
+	it("leaves a message Remit already placed alone on a re-entrant pass", async () => {
+		const harness = buildHarness(
+			{
+				messageId: "m-1",
+				mailboxId: MAILBOXES.inbox.mailboxId,
+				movedByRemit: true,
+			},
+			{ autoArchive: { value: true, setAt: 1_000 } },
+		);
+
+		await readBody(harness.service);
+
+		assert.deepEqual(harness.moves, []);
+	});
+});

package/src/body-sync.ts

@@ -48,6 +48,7 @@ import {
 import {
 	classifyPlacement,
 	type FolderPlacement,
+	type PlacementVerdict,
 	resolveBlockedVsTrust,
 } from "./heuristics/classifyPlacement.js";
 import type { PlacementMoveService } from "./placement-move.js";
@@ -199,6 +200,26 @@ const hasDecidedCategory = (
 const hasDecidedPlacement = (placementDecidedAt: number | undefined): boolean =>
 	placementDecidedAt !== undefined;
 
+/**
+ * Issue #398: `flags.autoArchive` is a filing preference relative to the Inbox.
+ * A `leave` verdict reaches it for two unrelated reasons and only one of them
+ * means "nothing confident to say":
+ *
+ * - `already-moved-by-remit` is {@link classifyPlacement}'s guard against
+ *   re-deciding a settled placement, and auto-archive is a re-decision. The
+ *   re-entrant paths `hasDecidedPlacement` names reach it on messages Remit
+ *   itself placed, or that a user moved back afterwards.
+ * - A message already in Junk gets an unsure `leave` whatever the sender's
+ *   `blocked` flag says, since the demote branch only fires outside Junk.
+ *   Moving mail out of Junk is a rescue, which this file reserves for a
+ *   confident signal plus sender trust.
+ */
+const autoArchiveApplies = (
+	verdict: PlacementVerdict,
+	placement: FolderPlacement,
+): boolean =>
+	placement !== "junk" && !verdict.reasons.includes("already-moved-by-remit");
+
 export const toParsedBody = (parsed: ParsedMail): ParsedBody => ({
 	text: parsed.text ?? null,
 	html: typeof parsed.html === "string" ? parsed.html : null,
@@ -1459,12 +1480,14 @@ export class BodySyncService {
 		// junk/inbox verdict computed above. Still marked decided (issue #383):
 		// "leave" is itself a verdict, not "not yet evaluated".
 		if (verdict.action === "leave") {
-			const outcome = await this.resolveAutoArchive(
-				mailboxSpecialUseService,
-				message,
-				accountId,
-				signals.autoArchive,
-			);
+			const outcome = autoArchiveApplies(verdict, placement)
+				? await this.resolveAutoArchive(
+						mailboxSpecialUseService,
+						message,
+						accountId,
+						signals.autoArchive,
+					)
+				: {};
 			return { ...outcome, placementDecidedAt: Date.now() };
 		}
 
@@ -1526,7 +1549,8 @@ export class BodySyncService {
 	 * straight to Archive, skipping Inbox. Only reached from
 	 * {@link computePlacement} when {@link classifyPlacement} had no confident
 	 * junk/inbox verdict of its own — `blocked`/DKIM/DMARC always take priority
-	 * over this filing preference.
+	 * over this filing preference — and only for the `leave` verdicts
+	 * {@link autoArchiveApplies} admits.
 	 *
 	 * No {@link MessagePlacementVerdict} is recorded: `PlacementAction` (the
 	 * audit enum) has only `MoveToInbox`/`MoveToJunk` — issue #300 is scoped to