@remit/web-client 0.0.268 → 0.0.269

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.268",
+  "version": "0.0.269",
   "type": "module",
   "description": "Remit web client, published as composable primitives — the app shell, auth shells, and runtime config. A distributor imports what it composes and bundles it.",
   "exports": {

package/src/components/ui/placement-refusal.test.ts

@@ -50,6 +50,7 @@ describe("placementRefusalBanner", () => {
 		const banner = placementRefusalBanner(
 			{ reason: "in_flight", messageId: "msg-1" },
 			1,
+			"delete",
 		);
 		assert.equal(banner.severity, "warning");
 		assert.match(banner.detail ?? "", /try again in a moment/i);
@@ -59,6 +60,7 @@ describe("placementRefusalBanner", () => {
 		const banner = placementRefusalBanner(
 			{ reason: "unverified", messageId: "msg-1" },
 			1,
+			"delete",
 		);
 		assert.match(banner.detail ?? "", /sync the folder/i);
 		assert.doesNotMatch(banner.detail ?? "", /try again in a moment/i);
@@ -66,14 +68,43 @@ describe("placementRefusalBanner", () => {
 
 	it("counts the selection in the title", () => {
 		assert.match(
-			placementRefusalBanner({ reason: "in_flight", messageId: "m" }, 4).title,
+			placementRefusalBanner(
+				{ reason: "in_flight", messageId: "m" },
+				4,
+				"delete",
+			).title,
 			/4 messages/,
 		);
 	});
 
+	// A move refused mid-flight told the user their delete failed — an action
+	// they never took, and a remedy pointing at the wrong verb.
+	it("names the action the user pressed, not the delete", () => {
+		const title = placementRefusalBanner(
+			{ reason: "in_flight", messageId: "msg-1" },
+			1,
+			"move",
+		).title;
+		assert.match(title, /move this message/i);
+		assert.doesNotMatch(title, /delete/i);
+
+		const detail =
+			placementRefusalBanner(
+				{ reason: "unverified", messageId: "msg-1" },
+				1,
+				"move",
+			).detail ?? "";
+		assert.match(detail, /move it again/i);
+		assert.doesNotMatch(detail, /delete/i);
+	});
+
 	it("never repeats the server's uuid at the user", () => {
 		for (const reason of ["in_flight", "unverified"] as const) {
-			const banner = placementRefusalBanner({ reason, messageId: "msg-1" }, 1);
+			const banner = placementRefusalBanner(
+				{ reason, messageId: "msg-1" },
+				1,
+				"delete",
+			);
 			assert.doesNotMatch(`${banner.title} ${banner.detail}`, /msg-1/);
 		}
 	});

package/src/components/ui/placement-refusal.ts

@@ -1,7 +1,8 @@
 /**
- * The coded 409 a delete is refused with when the message's folder and uid do
- * not name the same message (#845). Read the `code`, never the message: the
- * server's sentence names a uuid and no remedy, and a message-string match
+ * The coded 409 a delete or a move is refused with when the message's folder
+ * and uid do not name the same message (#845). Read the `code`, never the
+ * message: the server's sentence names a uuid and no remedy, and a
+ * message-string match
  * would start firing on an unrelated conflict the moment the copy changes.
  */
 import type { PushErrorInput } from "@/components/ui/error-banners";
@@ -45,6 +46,12 @@ export const isPlacementRefusal = (
 	return { reason: reason as PlacementRefusalReason, messageId };
 };
 
+/**
+ * What the user pressed. The same refusal answers a delete and a move, and the
+ * banner names the action they took rather than one they never asked for.
+ */
+export type PlacementRefusalAction = "delete" | "move";
+
 /**
  * The banner copy. Both reasons say what happened and what to do; neither is a
  * dead end, and neither repeats the server's uuid at the user.
@@ -52,14 +59,15 @@ export const isPlacementRefusal = (
 export const placementRefusalBanner = (
 	refusal: PlacementRefusal,
 	count: number,
+	action: PlacementRefusalAction,
 ): PushErrorInput => ({
 	severity: "warning",
 	title:
 		count > 1
-			? `Couldn't delete ${count} messages yet`
-			: "Couldn't delete this message yet",
+			? `Couldn't ${action} ${count} messages yet`
+			: `Couldn't ${action} this message yet`,
 	detail:
 		refusal.reason === "in_flight"
 			? "It is still being moved on the mail server. Try again in a moment."
-			: "An earlier move never finished, so where this message sits is unknown. Sync the folder, then delete it again.",
+			: `An earlier move never finished, so where this message sits is unknown. Sync the folder, then ${action} it again.`,
 });

package/src/hooks/refusal-escalation.render.test.ts

@@ -32,15 +32,20 @@ import { createDomHarness, type DomHarness } from "../test-support/dom";
 import { type HttpMock, mockFetch } from "../test-support/http";
 import { useDeleteMessages } from "./useDeleteMessages";
 import { type EmptyTrashState, useEmptyTrash } from "./useEmptyTrash";
+import { useMoveMessages } from "./useMoveMessages";
 import "@/lib/client";
 
 const ACCOUNT = "acc-1";
 const INBOX = "mbx-inbox";
 const TRASH = "mbx-trash";
+const ARCHIVE = "mbx-archive";
 
 let harness: DomHarness | undefined;
 let http: HttpMock | undefined;
 let deleteMessages: ((messageIds: string[]) => void) | undefined;
+let moveMessages:
+	| ((messageIds: string[], destinationMailboxId: string) => void)
+	| undefined;
 let trash: EmptyTrashState | undefined;
 
 afterEach(() => {
@@ -49,6 +54,7 @@ afterEach(() => {
 	http?.restore();
 	http = undefined;
 	deleteMessages = undefined;
+	moveMessages = undefined;
 	trash = undefined;
 	__resetFatalError();
 });
@@ -77,6 +83,19 @@ const refusal = (): Response =>
 		{ status: 409, headers: { "content-type": "application/json" } },
 	);
 
+/** The move gate's own coded 409: the row's folder and uid disagree (#665). */
+const unsettled = (): Response =>
+	new Response(
+		JSON.stringify({
+			status: 409,
+			message:
+				"Message msg-1 was not acted on: its folder and uid do not name the same message",
+			code: "message_placement_unsettled",
+			details: { accountId: ACCOUNT, messageId: "msg-1", reason: "in_flight" },
+		}),
+		{ status: 409, headers: { "content-type": "application/json" } },
+	);
+
 const broken = (): Response =>
 	new Response(JSON.stringify({ message: "boom" }), {
 		status: 500,
@@ -88,6 +107,10 @@ const Probe = () => {
 		mailboxId: INBOX,
 		accountId: ACCOUNT,
 	}).deleteMessages;
+	moveMessages = useMoveMessages({
+		mailboxId: INBOX,
+		accountId: ACCOUNT,
+	}).moveMessages;
 	trash = useEmptyTrash({ accountId: ACCOUNT, mailboxId: TRASH });
 	return null;
 };
@@ -172,6 +195,39 @@ describe("a delete refused for its folder role", () => {
 	});
 });
 
+describe("a move refused for an unsettled placement", () => {
+	it("states the wait in a banner without taking the screen", async () => {
+		await mount(responder("/messages/move", unsettled));
+
+		await act(async () => {
+			moveMessages?.(["msg-1"], ARCHIVE);
+		});
+		await settle();
+
+		assert.equal(
+			getCurrentFatalError(),
+			null,
+			"a refusal the banner answers is not a fatal error",
+		);
+		assert.match(harness?.text() ?? "", /Couldn't move this message yet/);
+		assert.match(harness?.text() ?? "", /Try again in a moment/);
+	});
+
+	it("still escalates a 500 on the same move", async () => {
+		await mount(responder("/messages/move", broken));
+
+		await act(async () => {
+			moveMessages?.(["msg-1"], ARCHIVE);
+		});
+		await settle();
+
+		assert.ok(
+			getCurrentFatalError(),
+			"the 409 opt-out must not cover anything else",
+		);
+	});
+});
+
 describe("an empty Trash refused for its folder role", () => {
 	it("states the refusal in the pane without taking the screen", async () => {
 		await mount(responder("/trash/empty", refusal));

package/src/hooks/useDeleteMessages.ts

@@ -186,7 +186,7 @@ export const useDeleteMessages = ({
 			const count = vars.body.messageIds?.length ?? 0;
 			const placement = isPlacementRefusal(err);
 			if (placement) {
-				pushError(placementRefusalBanner(placement, count));
+				pushError(placementRefusalBanner(placement, count, "delete"));
 				return;
 			}
 			pushError({

package/src/hooks/useMoveMessages.ts

@@ -8,7 +8,12 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useCallback } from "react";
 import { useErrorBanners } from "@/components/ui/ErrorBannerProvider";
 import { formatErrorDetail } from "@/components/ui/error-banners";
+import {
+	isPlacementRefusal,
+	placementRefusalBanner,
+} from "@/components/ui/placement-refusal";
 import { runChunkedMutation } from "@/lib/bulk-actions";
+import { softErrorStatuses } from "@/lib/error-classifier";
 import {
 	cancelThreadListQueries,
 	invalidateThreadListQueries,
@@ -57,6 +62,10 @@ export const useMoveMessages = ({
 
 	const { mutateAsync, isPending, isError } = useMutation({
 		...messageBulkOperationsMoveMessagesMutation(),
+		// A coded 409 is answered here — a banner — so it must not also take the
+		// whole screen. Only 409: a 401, 403 or 5xx on a move is still the fatal
+		// page's (#1059).
+		meta: softErrorStatuses(409),
 		onMutate: async (variables): Promise<ThreadMutationContext> => {
 			const messageIds = new Set(variables.body.messageIds ?? []);
 
@@ -136,6 +145,13 @@ export const useMoveMessages = ({
 				restoreThreadListQueries(queryClient, context.previousThreadsList);
 			}
 			const count = vars.body.messageIds?.length ?? 0;
+			// A placement refusal is a wait or a resync, not a failure to report as
+			// one: the move was never made, and the banner says which.
+			const placement = isPlacementRefusal(err);
+			if (placement) {
+				pushError(placementRefusalBanner(placement, count, "move"));
+				return;
+			}
 			pushError({
 				title:
 					count > 1