@remit/web-client 0.0.94 → 0.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.94",
+  "version": "0.0.95",
   "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/mail/BriefPane.selection.test.ts

@@ -47,6 +47,5 @@ describe("BriefPane phone selection surface (#203)", () => {
 		const next = source.indexOf("\nfunction ", start + 1);
 		const body = source.slice(start, next === -1 ? undefined : next);
 		assert.match(body, /onDeleteMessages=\{onDeleteMessages\}/);
-		assert.match(body, /onMarkMessagesRead=\{onMarkMessagesRead\}/);
 	});
 });

package/src/components/mail/BriefPane.tsx

@@ -68,7 +68,6 @@ interface BriefPaneContextValue {
 	/** Keyboard, multi-select and next/previous, shared with the mailbox view. */
 	triage: TriageContext;
 	onDeleteMessages: (messageIds: string[]) => void;
-	onMarkMessagesRead: (messageIds: string[]) => void;
 	nextMessageId: string | undefined;
 	previousMessageId: string | undefined;
 }
@@ -206,10 +205,6 @@ function BriefPaneProvider({ selectedMessageId, children }: BriefPaneProps) {
 		mailboxId: selectedThread?.mailboxId ?? "",
 		messages: briefThreads,
 	});
-	const handleMarkMessagesRead = useCallback(
-		(messageIds: string[]) => toggleReadFor(messageIds, true),
-		[toggleReadFor],
-	);
 
 	const focusedThreadId = triage.focusedMessageId;
 	const focusedThread = useMemo(
@@ -228,20 +223,18 @@ function BriefPaneProvider({ selectedMessageId, children }: BriefPaneProps) {
 			reply: () => actions.requestCompose("reply"),
 			replyAll: () => actions.requestCompose("reply_all"),
 			forward: () => actions.requestCompose("forward"),
+			// The list takes any verb aimed at its selection and opens the wizard
+			// on it, so a shortcut can never reach a bulk action the bar would have
+			// reviewed. What comes back here is a verb aimed at the bare cursor.
 			delete: () => {
-				if (triage.listCommandsRef.current?.requestDelete()) return;
+				if (triage.listCommandsRef.current?.requestVerb("delete")) return;
 				triageActions.deleteThread();
 			},
 			toggleStar: triageActions.toggleStar,
 			toggleRead: () => {
-				const ids =
-					triage.selectedIds.length > 0
-						? triage.selectedIds
-						: triageTarget
-							? [triageTarget.messageId]
-							: [];
-				if (ids.length === 0) return;
-				toggleReadFor(ids, !(triageTarget?.isRead ?? false));
+				if (triage.listCommandsRef.current?.requestVerb("markRead")) return;
+				if (!triageTarget) return;
+				toggleReadFor([triageTarget.messageId], !triageTarget.isRead);
 			},
 			goFlagged: () => navigate({ to: "/mail/flagged" }),
 			goSettings: () => navigate({ to: "/settings" }),
@@ -258,7 +251,6 @@ function BriefPaneProvider({ selectedMessageId, children }: BriefPaneProps) {
 		actions,
 		triage,
 		onDeleteMessages: deleteMessages,
-		onMarkMessagesRead: handleMarkMessagesRead,
 		nextMessageId,
 		previousMessageId,
 	};
@@ -280,7 +272,6 @@ function BriefList() {
 		onSelectSearchResult,
 		triage,
 		onDeleteMessages,
-		onMarkMessagesRead,
 	} = useBriefPane();
 	const { accounts } = useMailContext();
 
@@ -293,7 +284,6 @@ function BriefList() {
 			commandsRef={triage.listCommandsRef}
 			onTriageContextChange={triage.onTriageContextChange}
 			onDeleteMessages={onDeleteMessages}
-			onMarkMessagesRead={onMarkMessagesRead}
 		/>
 	);
 }

package/src/components/mail/DailyBrief.selection.test.ts

@@ -47,11 +47,29 @@ describe("the brief's select-all", () => {
 		);
 	});
 
-	it("sends every verb on the bar into the wizard (#477 1.4)", () => {
+	it("carries every verb the bar can offer (#477 1.4)", () => {
+		// That each of them opens the wizard is `selection-verbs.test.ts`, over
+		// every surface at once. What this pins is that none of them was dropped
+		// from the bar the brief raises.
 		const body = chromeBody();
-		for (const verb of ["delete", "move", "junk", "markRead", "organize"]) {
-			assert.match(body, new RegExp(`startWizard\\("${verb}"\\)`));
+		for (const prop of [
+			"onDelete",
+			"onMove",
+			"onOrganize",
+			"onJunk",
+			"onMarkRead",
+		]) {
+			assert.match(body, new RegExp(`${prop}=`));
 		}
 		assert.doesNotMatch(body, /onSomethingElse/);
 	});
+
+	it("drives the wizard and the keyboard layer from one control", () => {
+		// Two copies of "which verb is the wizard on" is how the brief came to
+		// offer a verb the mailbox list did not, and how its keyboard came to act
+		// behind a wizard the bar had opened.
+		assert.match(source, /const wizard = useSelectionWizard\(\);/);
+		assert.match(source, /onSelectionVerb={wizard.start}/);
+		assert.match(source, /wizardOpen={wizard.isOpen}/);
+	});
 });

package/src/components/mail/DailyBrief.tsx

@@ -46,7 +46,6 @@ import {
 	SelectionTopBar,
 	type ThreadRowData,
 	type ThreadSection,
-	type Verb,
 } from "@remit/ui";
 import { useQueries, useQuery } from "@tanstack/react-query";
 import { useNavigate } from "@tanstack/react-router";
@@ -82,7 +81,10 @@ import type { ListHeaderChrome } from "@/lib/list-header-chrome";
 import { useMailContext } from "@/lib/mail-context";
 import { relatedSearchResults, rowToSearchResult } from "@/lib/search-result";
 import { parseSearchTokens } from "@/lib/search-tokens";
-import { useOpenWizard } from "@/lib/wizard-history";
+import {
+	type SelectionWizardControl,
+	useSelectionWizard,
+} from "@/lib/wizard-history";
 import { LabelApplyTrigger } from "./LabelApplyTrigger";
 import { MailListHeader, type MailListHeaderProps } from "./MailListHeader";
 import type { MessageListCommands } from "./MessageList";
@@ -294,7 +296,8 @@ interface BriefSelectionChromeProps {
 	>;
 	/** The rows the list is showing, for resolving the selection's scope. */
 	rows: readonly ThreadRowData[];
-	onMarkMessagesRead?: (messageIds: string[]) => void;
+	/** The wizard every verb on this bar opens, shared with the keyboard layer. */
+	wizard: SelectionWizardControl;
 	children: ReactNode;
 }
 
@@ -307,7 +310,7 @@ interface BriefSelectionChromeProps {
 function BriefSelectionChrome({
 	header,
 	rows,
-	onMarkMessagesRead,
+	wizard,
 	children,
 }: BriefSelectionChromeProps) {
 	const {
@@ -326,18 +329,6 @@ function BriefSelectionChrome({
 	const { junkMailboxId } = useJunkMailbox(scope.accountId);
 	const { labels } = useLabelList(scope.accountId);
 
-	const openWizard = useOpenWizard();
-	// The verb the bar was pressed for. The wizard is open for as long as the URL
-	// holds a step, so a back that pops the last one closes it.
-	const [wizardVerb, setWizardVerb] = useState<Verb>("organize");
-	const startWizard = useCallback(
-		(verb: Verb) => {
-			setWizardVerb(verb);
-			openWizard("match");
-		},
-		[openWizard],
-	);
-
 	const selectedMessageIds = useMemo(
 		() => Array.from(selectedIds),
 		[selectedIds],
@@ -391,13 +382,11 @@ function BriefSelectionChrome({
 			idleSlot={chrome.makeFilterSlot}
 			count={selectedCount}
 			onCancel={exitSelection}
-			onDelete={() => startWizard("delete")}
-			onMove={() => startWizard("move")}
-			onOrganize={() => startWizard("organize")}
-			onJunk={canJunk ? () => startWizard("junk") : undefined}
-			onMarkRead={
-				onMarkMessagesRead ? () => startWizard("markRead") : undefined
-			}
+			onDelete={() => wizard.start("delete")}
+			onMove={() => wizard.start("move")}
+			onOrganize={() => wizard.start("organize")}
+			onJunk={canJunk ? () => wizard.start("junk") : undefined}
+			onMarkRead={() => wizard.start("markRead")}
 			overflowSlot={
 				scope.accountId &&
 				scope.mailboxId &&
@@ -426,7 +415,7 @@ function BriefSelectionChrome({
 			selectionBar={selectionBar}
 			paneOverlay={
 				<SelectionWizardHost
-					verb={wizardVerb}
+					verb={wizard.verb}
 					accountId={scope.accountId}
 					mailboxId={scope.mailboxId}
 					selection={wizardSelection}
@@ -459,7 +448,6 @@ interface DailyBriefProps {
 	/** Cursor / selection / display order, reported up to the triage layer. */
 	onTriageContextChange?: (context: TriageContextUpdate) => void;
 	onDeleteMessages: (messageIds: string[]) => void;
-	onMarkMessagesRead?: (messageIds: string[]) => void;
 }
 
 export function DailyBrief({
@@ -470,11 +458,11 @@ export function DailyBrief({
 	commandsRef,
 	onTriageContextChange,
 	onDeleteMessages,
-	onMarkMessagesRead,
 }: DailyBriefProps) {
 	const { searchQuery, resultFolderIndex } = useMailContext();
 	const tokenContext = useSearchTokenContext();
 	const isDesktop = useIsDesktop();
+	const wizard = useSelectionWizard();
 
 	const nonMuted = useMemo(
 		() => sortAccountsByCreatedAt(accounts.filter((a) => !a.muted?.value)),
@@ -780,10 +768,13 @@ export function DailyBrief({
 			selectedMessageId={selectedMessageId}
 			onOpen={(id, options) => onSelectMessage?.(id, options)}
 			onDeleteMessages={onDeleteMessages}
+			onSelectionVerb={wizard.start}
+			wizardOpen={wizard.isOpen}
 			commandsRef={commandsRef}
 			onTriageContextChange={onTriageContextChange}
 		>
 			<BriefSelectionChrome
+				wizard={wizard}
 				header={{
 					title: "Daily brief",
 					unreadCount: totalUnseen,
@@ -796,7 +787,6 @@ export function DailyBrief({
 					onSelectSearchResult,
 				}}
 				rows={filteredRows}
-				onMarkMessagesRead={onMarkMessagesRead}
 			>
 				<div className="flex h-full flex-col">
 					{failedAccounts.map((account) => (

package/src/components/mail/FlaggedList.tsx

@@ -17,6 +17,7 @@ import {
 	flaggedFilterConfig,
 	MessageListPane,
 	type ThreadRowData,
+	type Verb,
 } from "@remit/ui";
 import { type RefObject, useCallback, useMemo, useState } from "react";
 import { formatErrorMessage } from "@/components/ui/ErrorState";
@@ -35,6 +36,7 @@ import { useMailContext } from "@/lib/mail-context";
 import { rowToSearchResult } from "@/lib/search-result";
 import { parseSearchTokens } from "@/lib/search-tokens";
 import { dedupeByThread } from "@/lib/starred-rows";
+import { useSelectionWizard } from "@/lib/wizard-history";
 import { MailViewChrome } from "./MailViewChrome";
 import type { MessageListCommands } from "./MessageList";
 import { MessageRow } from "./MessageRow";
@@ -55,17 +57,24 @@ const FILTER_PREDICATES: Record<string, (t: ThreadRowData) => boolean> = {
 };
 
 /**
- * The wizard, on the one surface whose bar borrows it rather than raising it.
+ * The wizard this view's verbs walk, and the one its search entry lands on.
  *
- * The list header offers "make this a filter" wherever a search is active, and
- * the step that affordance pushes has to be answered on the view that offered
- * it — an affordance whose press lands on nothing is the dead button clause 1.7
- * exists to prevent. Starred spans accounts and mailboxes, so a rule made from
- * the ticked rows has no single account to belong to; a rule made from the
- * query belongs to the account the query names, which the host reads for
- * itself.
+ * The bar's Delete and Mark read open it on the ticked rows, so a bulk action
+ * here is reviewed exactly as it is on the mailbox list. The list header also
+ * offers "make this a filter" wherever a search is active, and the step that
+ * affordance pushes has to be answered on the view that offered it — an
+ * affordance whose press lands on nothing is the dead button clause 1.7 exists
+ * to prevent. Starred spans accounts and mailboxes, so a rule made from the
+ * ticked rows has no single account to belong to; a rule made from the query
+ * belongs to the account the query names, which the host reads for itself.
  */
-function StarredWizardHost({ rows }: { rows: readonly ThreadRowData[] }) {
+function StarredWizardHost({
+	rows,
+	verb,
+}: {
+	rows: readonly ThreadRowData[];
+	verb: Verb;
+}) {
 	const { selectedIds, exitSelection } = useThreadListSelection();
 	const selection = useMemo<WizardSelectionMessage[]>(
 		() =>
@@ -82,7 +91,7 @@ function StarredWizardHost({ rows }: { rows: readonly ThreadRowData[] }) {
 	);
 	return (
 		<SelectionWizardHost
-			verb="organize"
+			verb={verb}
 			selection={selection}
 			crossAccount
 			onFinished={exitSelection}
@@ -98,7 +107,6 @@ interface FlaggedListProps {
 	/** Cursor / selection / display order, reported up to the triage layer. */
 	onTriageContextChange?: (context: TriageContextUpdate) => void;
 	onDeleteMessages: (messageIds: string[]) => void;
-	onMarkMessagesRead?: (messageIds: string[]) => void;
 }
 
 export function FlaggedList({
@@ -107,11 +115,11 @@ export function FlaggedList({
 	commandsRef,
 	onTriageContextChange,
 	onDeleteMessages,
-	onMarkMessagesRead,
 }: FlaggedListProps) {
 	const { searchQuery, resultFolderIndex } = useMailContext();
 	const tokenContext = useSearchTokenContext();
 	const isDesktop = useIsDesktop();
+	const wizard = useSelectionWizard();
 
 	const [selectedCategory, setSelectedCategory] = useState("all");
 	const [activeFilters, setActiveFilters] = useState<ReadonlySet<string>>(
@@ -234,6 +242,8 @@ export function FlaggedList({
 				selectedMessageId={selectedMessageId}
 				onOpen={(id, options) => onSelectMessage?.(id, options)}
 				onDeleteMessages={onDeleteMessages}
+				onSelectionVerb={wizard.start}
+				wizardOpen={wizard.isOpen}
 				commandsRef={commandsRef}
 				onTriageContextChange={onTriageContextChange}
 			>
@@ -251,18 +261,13 @@ export function FlaggedList({
 					onSelectThread={onSelectMessage}
 					onSelectBriefCategory={() => undefined}
 					isDesktop={isDesktop}
-					selectionBar={
-						<ThreadListSelectionBar
-							title="Starred"
-							onMarkAsRead={onMarkMessagesRead}
-						/>
-					}
+					selectionBar={<ThreadListSelectionBar title="Starred" />}
 					listBody={
 						chrome.searchResults ??
 						(listState === "ready" ? listBody : undefined)
 					}
 				/>
-				<StarredWizardHost rows={rows} />
+				<StarredWizardHost rows={rows} verb={wizard.verb} />
 			</ThreadListInteraction>
 		</MailViewChrome>
 	);

package/src/components/mail/FlaggedPane.tsx

@@ -64,7 +64,6 @@ interface FlaggedPaneContextValue {
 	/** Keyboard, multi-select and next/previous, shared with the mailbox view. */
 	triage: TriageContext;
 	onDeleteMessages: (messageIds: string[]) => void;
-	onMarkMessagesRead: (messageIds: string[]) => void;
 	nextMessageId: string | undefined;
 	previousMessageId: string | undefined;
 }
@@ -145,10 +144,6 @@ function FlaggedPaneProvider({
 		mailboxId: selectedThread?.mailboxId ?? "",
 		messages: threads,
 	});
-	const handleMarkMessagesRead = useCallback(
-		(messageIds: string[]) => toggleReadFor(messageIds, true),
-		[toggleReadFor],
-	);
 
 	const focusedThreadId = triage.focusedMessageId;
 	const focusedThread = useMemo(
@@ -167,20 +162,18 @@ function FlaggedPaneProvider({
 			reply: () => actions.requestCompose("reply"),
 			replyAll: () => actions.requestCompose("reply_all"),
 			forward: () => actions.requestCompose("forward"),
+			// The list takes any verb aimed at its selection and opens the wizard
+			// on it, so a shortcut can never reach a bulk action the bar would have
+			// reviewed. What comes back here is a verb aimed at the bare cursor.
 			delete: () => {
-				if (triage.listCommandsRef.current?.requestDelete()) return;
+				if (triage.listCommandsRef.current?.requestVerb("delete")) return;
 				triageActions.deleteThread();
 			},
 			toggleStar: triageActions.toggleStar,
 			toggleRead: () => {
-				const ids =
-					triage.selectedIds.length > 0
-						? triage.selectedIds
-						: triageTarget
-							? [triageTarget.messageId]
-							: [];
-				if (ids.length === 0) return;
-				toggleReadFor(ids, !(triageTarget?.isRead ?? false));
+				if (triage.listCommandsRef.current?.requestVerb("markRead")) return;
+				if (!triageTarget) return;
+				toggleReadFor([triageTarget.messageId], !triageTarget.isRead);
 			},
 			goBrief: () => navigate({ to: "/mail" }),
 			goSettings: () => navigate({ to: "/settings" }),
@@ -195,7 +188,6 @@ function FlaggedPaneProvider({
 		actions,
 		triage,
 		onDeleteMessages: deleteMessages,
-		onMarkMessagesRead: handleMarkMessagesRead,
 		nextMessageId,
 		previousMessageId,
 	};
@@ -211,13 +203,8 @@ function FlaggedPaneProvider({
 
 /** Flat starred list. Mount in the `list` slot of `AppShellSlotted`. */
 function FlaggedListSlot() {
-	const {
-		selectedMessageId,
-		onSelectMessage,
-		triage,
-		onDeleteMessages,
-		onMarkMessagesRead,
-	} = useFlaggedPane();
+	const { selectedMessageId, onSelectMessage, triage, onDeleteMessages } =
+		useFlaggedPane();
 	return (
 		<FlaggedList
 			selectedMessageId={selectedMessageId}
@@ -225,7 +212,6 @@ function FlaggedListSlot() {
 			commandsRef={triage.listCommandsRef}
 			onTriageContextChange={triage.onTriageContextChange}
 			onDeleteMessages={onDeleteMessages}
-			onMarkMessagesRead={onMarkMessagesRead}
 		/>
 	);
 }

package/src/components/mail/MailboxPane.tsx

@@ -695,21 +695,24 @@ function MailboxPaneProvider({
 		if (selectedThread) setToolbarComposeRequest("forward");
 	}, [ensureFocusedOpen, selectedThread, setToolbarComposeRequest]);
 
-	const triageTargetMessageIds = useCallback((): string[] => {
-		if (triageSelectedIds.length > 0) return triageSelectedIds;
-		return messageIdsForFocusedThread(focusedThread);
-	}, [triageSelectedIds, messageIdsForFocusedThread, focusedThread]);
-
-	// Prefer the list's delete: it confirms the move to Trash and then places the
-	// cursor on a surviving row. Falls back to the reading pane's message when no
-	// list is mounted or nothing in it is targeted.
+	const triageTargetMessageIds = useCallback(
+		(): string[] => messageIdsForFocusedThread(focusedThread),
+		[messageIdsForFocusedThread, focusedThread],
+	);
+
+	// Every verb the list can take, it takes: over a selection it opens the
+	// wizard, which is where a bulk action is reviewed before it reaches the mail
+	// server (#477 1.4, #508). What falls through is aimed at the bare cursor, or
+	// at the reading pane when no list is mounted — one message, not a bulk
+	// action, and the pane acts on it directly.
 	const triageDeleteAction = useCallback(() => {
-		if (listCommandsRef.current?.requestDelete()) return;
+		if (listCommandsRef.current?.requestVerb("delete")) return;
 		const ids = triageTargetMessageIds();
 		if (ids.length > 0) triageDelete(ids);
 	}, [listCommandsRef, triageTargetMessageIds, triageDelete]);
 
 	const triageMarkJunk = useCallback(() => {
+		if (listCommandsRef.current?.requestVerb("junk")) return;
 		if (!junkMailboxId) return;
 		const ids = triageTargetMessageIds();
 		if (ids.length === 0) return;
@@ -720,6 +723,7 @@ function MailboxPaneProvider({
 		});
 		triageMove(ids, junkMailboxId);
 	}, [
+		listCommandsRef,
 		junkMailboxId,
 		triageTargetMessageIds,
 		triageMove,
@@ -727,6 +731,10 @@ function MailboxPaneProvider({
 		focusedThread,
 	]);
 
+	// Star is the one verb that acts on a selection from here. It is not on the
+	// selection bar and not one of the five the wizard walks: it sets a flag on
+	// mail that is already in front of the user and unsets it the same way, so
+	// there is nothing for a review screen to name and nothing to undo.
 	const triageStar = useCallback(() => {
 		if (triageSelectedIds.length > 0) {
 			const nextStarred = !(focusedThread?.hasStars ?? false);
@@ -743,11 +751,17 @@ function MailboxPaneProvider({
 	}, [triageSelectedIds, threads, focusedThread, focusedToggleStar]);
 
 	const triageToggleRead = useCallback(() => {
+		if (listCommandsRef.current?.requestVerb("markRead")) return;
 		const ids = triageTargetMessageIds();
 		if (ids.length === 0) return;
 		const nextRead = !(focusedThread?.isRead ?? false);
 		triageToggleReadFor(ids, nextRead);
-	}, [triageTargetMessageIds, focusedThread, triageToggleReadFor]);
+	}, [
+		listCommandsRef,
+		triageTargetMessageIds,
+		focusedThread,
+		triageToggleReadFor,
+	]);
 
 	const triageMute = useCallback(() => {
 		if (!focusedAddressId) return;
@@ -1013,7 +1027,6 @@ function MailboxList() {
 			searchQuery={searchQuery}
 			searchPredicate={searchPredicate}
 			onDeleteMessages={onDeleteMessages}
-			onMoveMessages={onMoveMessages}
 			isDeleting={isDeleting}
 			isMoving={isMoving}
 			onLoadMore={onLoadMore}

package/src/components/mail/MessageList.selection.test.ts

@@ -59,45 +59,43 @@ describe("MessageList selection mode", () => {
 });
 
 /**
- * An escalated selection is a predicate, so it has no id list to hand the
- * optimistic move/mark-read mutations — before #114 the bar simply dropped
- * both, leaving "select all 1,284 matching npm" able to delete and nothing
- * else. All three actions now page the predicate through the same run.
+ * An escalated selection is a predicate, and it walks the same wizard every
+ * other selection walks (#508). The list hands the wizard the predicate — the
+ * words it names it with, the count it was escalated to, and the chunked runner
+ * that re-resolves it — and keeps no second confirmation of its own.
  */
 describe("MessageList escalated actions", () => {
-	it("routes move and mark-read through the predicate run when escalated", () => {
+	it("hands the escalated predicate to the wizard rather than running it here", () => {
 		assert.match(
 			source,
-			/escalation\.phase\.kind === "escalated"\)\s*\{\s*void runEscalatedAction\(MARK_READ_ACTION\);/,
+			/const escalatedSelection: EscalatedSelection \| undefined =\s*escalation\.phase\.kind === "escalated"/,
 		);
 		assert.match(
 			source,
-			/escalation\.phase\.kind === "escalated"\)\s*\{\s*void runEscalatedAction\(\{ kind: "move", destinationMailboxId \}\);/,
+			/scope: describeSearchScope\(searchPredicate \?\? \{\}\)/,
 		);
-	});
-
-	it("keeps mark-read and the move slot on an escalated selection", () => {
-		// The bar always carries the mark-read verb (it drops it itself while
-		// counting or busy); an escalated selection must never lose it — it falls
-		// back to the predicate run, which the wizard cannot take.
-		assert.match(source, /: handleMarkAsRead\s*\}/);
-		// The move slot is offered for a bounded selection or an escalated one —
-		// #114's rule that an escalated selection is never delete-only.
+		assert.match(source, /total: escalation\.phase\.total/);
 		assert.match(
 			source,
-			/onMoveMessages \|\| escalation\.phase\.kind === "escalated"/,
+			/run: \(action: EscalatedAction\) => escalation\.runAction\(action\)/,
 		);
+		const host = source.match(/<SelectionWizardHost[\s\S]*?\/>/)?.[0] ?? "";
+		assert.match(host, /escalated=\{escalatedSelection\}/);
 	});
 
-	it("words progress and completion per action instead of per delete", () => {
+	it("keeps no predicate confirmation of its own", () => {
+		// The review screen names what the predicate covers; a second dialog
+		// asking the same question is the drift the wizard exists to end.
+		assert.doesNotMatch(source, /source: "predicate"/);
+		assert.doesNotMatch(source, /requestEscalatedDelete/);
+		assert.doesNotMatch(source, /pendingDeleteIsEstimate/);
+	});
+
+	it("words the bar's progress per action instead of per delete", () => {
 		assert.match(
 			source,
 			/bulkActionProgressLabel\(\s*escalation\.runningAction\.kind,/,
 		);
-		assert.match(
-			source,
-			/bulkActionCompletionText\(action\.kind, outcome\.done\)/,
-		);
 	});
 });
 
@@ -143,29 +141,45 @@ describe("MessageList escalation reaches desktop (#212)", () => {
 		assert.match(source, /navSlot=\{listHeaderChrome\.navSlot\}/);
 	});
 
-	it("sends every verb on the bar into the wizard (#477 1.4)", () => {
+	it("carries every verb the bar can offer (#477 1.4)", () => {
+		// That each of them opens the wizard is `selection-verbs.test.ts`, over
+		// every surface at once. What this pins is that none of them was dropped
+		// from the one bar the mailbox raises.
 		const bar = source.match(/<SelectionTopBar[\s\S]*?\n\t\t\/>/)?.[0] ?? "";
-		for (const verb of ["delete", "move", "junk", "markRead", "organize"]) {
-			assert.match(bar, new RegExp(`startWizard\\("${verb}"\\)`));
+		for (const prop of [
+			"onDelete",
+			"onMove",
+			"onOrganize",
+			"onJunk",
+			"onMarkRead",
+		]) {
+			assert.match(bar, new RegExp(`${prop}=`));
 		}
 		// The one selection surface has no second organize entry beside them.
 		assert.doesNotMatch(source, /onSomethingElse/);
 	});
 
+	it("keeps Organize reachable over a predicate rather than dropping it", () => {
+		// A verb that vanishes when a selection escalates leaves the user no route
+		// at all: the make-filter affordance it defers to is hidden while rows are
+		// ticked (#477 1.7).
+		assert.match(source, /if \(escalatedSelection\) \{\s*startFromSearch\(\);/);
+	});
+
 	it("offers the label picker only when the account has labels", () => {
 		assert.match(source, /labels\.length > 0 \? \(/);
 	});
 });
 
 /**
- * A bounded confirm-delete used to open the surviving neighbour by writing
+ * A confirmed delete used to open the surviving neighbour by writing
  * `selectedMessageId` into the URL. On desktop that fills the reading pane
  * beside the list; on a single-pane mobile layout the same navigation replaced
- * the list with a full-screen message, so a bulk delete read as "jumped into a
- * random message" rather than "the rows are gone" (#202). Mobile now stays on
- * the list and raises the same completion banner a chunked run does.
+ * the list with a full-screen message, so the delete read as "jumped into a
+ * random message" rather than "the row is gone" (#202). Mobile now stays on the
+ * list and raises a completion banner instead.
  */
-describe("MessageList bounded delete stays on the list on mobile (#202)", () => {
+describe("MessageList confirmed delete stays on the list on mobile (#202)", () => {
 	it("only the desktop two-pane opens the surviving neighbour after a delete", () => {
 		assert.match(
 			source,