@remit/backend 0.0.105 → 0.0.106

package/package.json

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

package/src/handlers/message.test.ts

@@ -1,5 +1,6 @@
 import assert from "node:assert/strict";
 import { describe, it } from "node:test";
+import { MessagePlacementUnsettledError } from "@remit/data-ports/errors";
 import {
 	MoveNotSettledError,
 	NoJunkMailboxError,
@@ -41,6 +42,32 @@ describe("settleSpamReportBulk", () => {
 		assert.notEqual(reason, GENERIC_FAILURE_REASON);
 	});
 
+	// A refusal the move gate raises used to collapse to the generic retry copy,
+	// which is a dead end for the reason no retry clears (#665).
+	it("words a placement refusal from its reason, never from the server's sentence", async () => {
+		const outcome = await settleSpamReportBulk(
+			["msg-1", "msg-2"],
+			async (messageId) => {
+				throw new MessagePlacementUnsettledError(
+					`Message ${messageId} was not acted on: its folder and uid do not name the same message`,
+					"acc-1",
+					messageId,
+					messageId === "msg-1" ? "in_flight" : "unverified",
+				);
+			},
+		);
+
+		const [inFlight, unverified] = outcome.failures?.map((f) => f.reason) ?? [];
+		assert.match(inFlight ?? "", /try again in a moment/i);
+		assert.match(unverified ?? "", /sync the folder/i);
+		assert.doesNotMatch(unverified ?? "", /try again in a moment/i);
+		for (const reason of [inFlight, unverified]) {
+			assert.notEqual(reason, GENERIC_FAILURE_REASON);
+			assert.doesNotMatch(reason ?? "", /folder and uid/);
+			assert.doesNotMatch(reason ?? "", /acc-1/);
+		}
+	});
+
 	it("omits failures entirely when every message succeeds", async () => {
 		const outcome = await settleSpamReportBulk(
 			["msg-1", "msg-2"],

package/src/handlers/message.ts

@@ -7,6 +7,7 @@ import type { MailboxItem } from "@remit/data-ports";
 import {
 	BadRequestError,
 	ForbiddenError,
+	MessagePlacementUnsettledError,
 	NotFoundError,
 	UnrecoverableBodyError,
 } from "@remit/data-ports/errors";
@@ -356,13 +357,35 @@ export const GENERIC_FAILURE_REASON =
  * each names what happened and what the user can do about it, which the
  * generic text cannot.
  */
-const DESIGNED_FAILURES = [MoveNotSettledError, NoJunkMailboxError];
+const DESIGNED_FAILURES = [
+	MoveNotSettledError,
+	NoJunkMailboxError,
+	MessagePlacementUnsettledError,
+];
 
 const isDesignedFailure = (reason: unknown): reason is Error =>
 	DESIGNED_FAILURES.some((designed) => reason instanceof designed);
 
-const failureReason = (reason: unknown): string =>
-	isDesignedFailure(reason) ? reason.message : GENERIC_FAILURE_REASON;
+/**
+ * The placement refusal is the one designed outcome whose own message is not
+ * the text to ship: it names a uuid and no remedy, and the two reasons do not
+ * share a remedy — an in-flight move settles on its own, an abandoned one only
+ * clears once the folder is resynced. Worded here off `details.reason`, the way
+ * the delete path words the same refusal for the client.
+ */
+const placementRefusalReason = (
+	error: MessagePlacementUnsettledError,
+): string =>
+	error.publicApiError?.details?.reason === "unverified"
+		? "An earlier move of this message never finished, so where it sits is unknown. Sync the folder, then report it again."
+		: "This message is still being moved on the mail server. Try again in a moment.";
+
+const failureReason = (reason: unknown): string => {
+	if (!isDesignedFailure(reason)) return GENERIC_FAILURE_REASON;
+	if (reason instanceof MessagePlacementUnsettledError)
+		return placementRefusalReason(reason);
+	return reason.message;
+};
 
 /**
  * Drive one report-spam/not-spam operation per message, concurrently. Each