@remit/web-client 0.0.187 → 0.0.189

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.187",
+  "version": "0.0.189",
   "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/DailyBrief.tsx

@@ -106,15 +106,13 @@ import {
 	type SelectionWizardControl,
 	useSelectionWizard,
 } from "@/lib/wizard-history";
+import { wizardSelectionFrom } from "@/lib/wizard-selection";
 import type { OpenThreadTarget } from "@/routing";
 import { LabelApplyTrigger } from "./LabelApplyTrigger";
 import { MailListHeader, type MailListHeaderProps } from "./MailListHeader";
 import type { MessageListCommands } from "./MessageList";
 import { MessageRow } from "./MessageRow";
-import {
-	SelectionWizardHost,
-	type WizardSelectionMessage,
-} from "./SelectionWizardHost";
+import { SelectionWizardHost } from "./SelectionWizardHost";
 import {
 	type OpenMessageOptions,
 	ThreadListInteraction,
@@ -283,17 +281,8 @@ function BriefSelectionChrome({
 	);
 	// The ticked rows as the wizard reads them — the sample under every screen
 	// that names a match, and the senders its widen falls back to.
-	const wizardSelection = useMemo<WizardSelectionMessage[]>(
-		() =>
-			rows
-				.filter((row) => selectedIds.has(row.id))
-				.map((row) => ({
-					id: row.id,
-					sender: row.fromName,
-					email: row.fromEmail,
-					subject: row.subject,
-					date: row.timeLabel,
-				})),
+	const wizardSelection = useMemo(
+		() => wizardSelectionFrom(rows, selectedIds),
 		[rows, selectedIds],
 	);
 

package/src/components/mail/FlaggedList.tsx

@@ -38,14 +38,12 @@ 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 { wizardSelectionFrom } from "@/lib/wizard-selection";
 import type { OpenThreadTarget } from "@/routing";
 import { MailViewChrome } from "./MailViewChrome";
 import type { MessageListCommands } from "./MessageList";
 import { MessageRow } from "./MessageRow";
-import {
-	SelectionWizardHost,
-	type WizardSelectionMessage,
-} from "./SelectionWizardHost";
+import { SelectionWizardHost } from "./SelectionWizardHost";
 import {
 	type OpenMessageOptions,
 	ThreadListInteraction,
@@ -78,17 +76,8 @@ function StarredWizardHost({
 	verb: Verb;
 }) {
 	const { selectedIds, exitSelection } = useThreadListSelection();
-	const selection = useMemo<WizardSelectionMessage[]>(
-		() =>
-			rows
-				.filter((row) => selectedIds.has(row.id))
-				.map((row) => ({
-					id: row.id,
-					sender: row.fromName,
-					email: row.fromEmail,
-					subject: row.subject,
-					date: row.timeLabel,
-				})),
+	const selection = useMemo(
+		() => wizardSelectionFrom(rows, selectedIds),
 		[rows, selectedIds],
 	);
 	return (

package/src/components/mail/MailboxPane.tsx

@@ -72,7 +72,11 @@ import {
 import type { EscalationSearchQuery } from "@/hooks/useEscalatedActions";
 import { useIntelligenceData } from "@/hooks/useIntelligenceData";
 import { useIntelligenceDrawer } from "@/hooks/useIntelligenceDrawer";
-import { useIntelligenceSurface } from "@/hooks/useIntelligenceSurface";
+import {
+	type IntelligenceCommands,
+	useIntelligenceSurface,
+	usePublishIntelligenceCommands,
+} from "@/hooks/useIntelligenceSurface";
 import { useLayoutTier } from "@/hooks/useLayoutTier";
 import { useMailboxAccount } from "@/hooks/useMailboxAccount";
 import { useToggleReadFor } from "@/hooks/useMarkAsRead";
@@ -168,8 +172,14 @@ interface MailboxPaneContextValue {
 	 * when no category is selected.
 	 */
 	listFilter: MessageListFilter | undefined;
-	intelligenceOpen: boolean;
 	onToggleIntelligence: () => void;
+	/**
+	 * Where the mounted reading surface publishes the intelligence commands the
+	 * keyboard layer drives. The rail's width gate is the shell's own
+	 * measurement and this provider sits above the shell, so the surface that is
+	 * mounted answers for its own tier rather than this one guessing.
+	 */
+	intelligenceRef: RefObject<IntelligenceCommands | null>;
 	/**
 	 * Deselects the open message when it's the one a mutation just removed
 	 * from this mailbox's list — wired into every mutation that can take the
@@ -260,8 +270,7 @@ function MailboxPaneProvider({
 	const threadId = thread?.threadId;
 	const pointedAtMessageId = thread?.messageId;
 	const telemetry = useTelemetry();
-	const { accounts, searchQuery, intelligenceOpen, onToggleIntelligence } =
-		useMailContext();
+	const { accounts, searchQuery, onToggleIntelligence } = useMailContext();
 	const tokenContext = useSearchTokenContext();
 
 	const normalizedSearchQuery = normalizeSearchQuery(searchQuery);
@@ -499,6 +508,8 @@ function MailboxPaneProvider({
 			onAfterOptimisticRemove: handleDeselectIfRemoved,
 		});
 
+	const intelligenceRef = useRef<IntelligenceCommands | null>(null);
+
 	const triage = useTriageContext();
 	const {
 		listCommandsRef,
@@ -691,9 +702,14 @@ function MailboxPaneProvider({
 		updateFocusedSenderFlags({ vip: { value: next } });
 	}, [focusedAddressId, focusedAddress, updateFocusedSenderFlags]);
 
+	// Block sender lives in intelligence, so the key raises whichever surface
+	// this width has: the rail above 1280, the drawer below it. Reaching for
+	// `onToggleIntelligence` from here wrote `#intelligence` at every tier, and
+	// a panel the address names with no renderer behind it is a panel that opens
+	// nothing (`docs/architecture/url-state.md`, R6).
 	const triageBlock = useCallback(() => {
-		if (!intelligenceOpen) onToggleIntelligence();
-	}, [intelligenceOpen, onToggleIntelligence]);
+		intelligenceRef.current?.open();
+	}, []);
 
 	const goToRoute = useCallback(
 		(to: "/mail/brief" | "/mail/flagged" | "/settings") => {
@@ -736,10 +752,12 @@ function MailboxPaneProvider({
 			toggleStar: triageStar,
 			toggleRead: triageToggleRead,
 			muteSender: triageMute,
-			blockSender: triageBlock,
+			blockSender: selectedThread ? triageBlock : undefined,
 			vipSender: triageVip,
 			markJunk: triageMarkJunk,
-			toggleIntelligence: selectedThread ? onToggleIntelligence : undefined,
+			toggleIntelligence: selectedThread
+				? () => intelligenceRef.current?.toggle()
+				: undefined,
 			compose: openCompose,
 			goBrief: () => goToRoute("/mail/brief"),
 			goInbox: () => goToRoute("/mail/brief"),
@@ -783,8 +801,8 @@ function MailboxPaneProvider({
 		onToggleFilterAttribute,
 		onClearFilters,
 		listFilter,
-		intelligenceOpen,
 		onToggleIntelligence,
+		intelligenceRef,
 		handleDeselectIfRemoved,
 		// Escalation ("select all N matching") re-issues this predicate server-side
 		// and acts on every match, so it is only offered when the predicate IS the
@@ -1064,9 +1082,11 @@ function MailboxReading() {
 		onToolbarStar,
 		onToolbarMove,
 		handleDeselectIfRemoved,
+		intelligenceRef,
 	} = useMailboxPane();
 	const hasThread = Boolean(conversation);
 	const intelligence = useIntelligenceSurface(conversation?.threadId);
+	usePublishIntelligenceCommands(intelligenceRef, intelligence);
 
 	// The rail opens itself on a DKIM mismatch. It lives here, behind the rail's
 	// own width gate, because raising it writes `#intelligence` into the address
@@ -1182,8 +1202,14 @@ function MailboxPhone() {
 		nextThread,
 		previousThread,
 		handleDeselectIfRemoved,
+		intelligenceRef,
 	} = useMailboxPane();
+	// The drawer directly, not `useIntelligenceSurface`: this view is what the
+	// shell mounts where it has one pane, so there is no rail to choose between
+	// — and the rail's own width gate answers yes on a wide portrait tablet the
+	// shell still put here.
 	const drawer = useIntelligenceDrawer(conversation?.threadId ?? null);
+	usePublishIntelligenceCommands(intelligenceRef, drawer);
 
 	if (conversation) {
 		return (

package/src/components/mail/MessageList.tsx

@@ -52,13 +52,13 @@ import { useListHeaderChrome } from "@/lib/list-header-chrome";
 import { listVerbRequest } from "@/lib/list-verb-request";
 import { shouldExitSelectionOnNavigate } from "@/lib/selection-mode";
 import { useSelectionWizard, useWizardStepValue } from "@/lib/wizard-history";
+import type { WizardSelectionMessage } from "@/lib/wizard-selection";
 import { useRetainOpenPanels } from "@/routing";
 import { DeleteConfirmDialog } from "./DeleteConfirmDialog";
 import { LabelApplyTrigger } from "./LabelApplyTrigger";
 import {
 	type EscalatedSelection,
 	SelectionWizardHost,
-	type WizardSelectionMessage,
 } from "./SelectionWizardHost";
 import { SwipeableMessageRow } from "./SwipeableMessageRow";
 
@@ -497,10 +497,11 @@ export const MessageList = ({
 				email: thread.fromEmail ?? "",
 				subject: thread.subject ?? "(No subject)",
 				date: formatEmailDate(thread.sentDate),
+				accountId,
 			});
 		}
 		return rows;
-	}, [threads, selectedIds]);
+	}, [threads, selectedIds, accountId]);
 	const handleRowSelect = useCallback(
 		(messageId: string, modifiers: SelectionModifiers): boolean => {
 			if (modifiers.shiftKey) {

package/src/components/mail/SelectionWizardHost.tsx

@@ -47,7 +47,11 @@ import { useOrganizeJob } from "@/hooks/useOrganizeJob";
 import { useOrganizeWiden } from "@/hooks/useOrganizeWiden";
 import { useRulePreview } from "@/hooks/useRulePreview";
 import { useSelectedSubjects } from "@/hooks/useSelectedSubjects";
-import type { BulkActionProgress, BulkRunOutcome } from "@/lib/bulk-actions";
+import type {
+	BulkActionProgress,
+	BulkActionTarget,
+	BulkRunOutcome,
+} from "@/lib/bulk-actions";
 import { NO_JUNK_FOLDER_REASON } from "@/lib/junk-destination";
 import { useListHeaderChrome } from "@/lib/list-header-chrome";
 import { useMailContext } from "@/lib/mail-context";
@@ -66,16 +70,11 @@ import {
 import { searchRuleAccountId } from "@/lib/organize/search-to-rule";
 import type { OrganizeMatchPredicate } from "@/lib/organize/sender-fallback";
 import { useWizardEntryValue, useWizardStep } from "@/lib/wizard-history";
+import type { WizardSelectionMessage } from "@/lib/wizard-selection";
 import { organizeRunState } from "./organize-run-state";
 
 const EMPTY_DRAFT: WizardDraft = { clauses: [], matchOperator: "any" };
 
-/** A ticked row, as the wizard's samples and its clause prefill read it. */
-export interface WizardSelectionMessage extends WizardMessage {
-	/** Sender address — the widen's literal fallback and the prefill match on it. */
-	email: string;
-}
-
 interface SelectionWizardSessionProps extends SelectionWizardHostProps {
 	/** The step the URL holds. The session is mounted only while there is one. */
 	step: StepId;
@@ -307,7 +306,14 @@ function SelectionWizardSession({
 		OrganizeScope | undefined
 	>(undefined);
 	const [bulkRun, setBulkRun] = useState<
-		| { matched: number; outcome?: BulkRunOutcome; failureReason?: string }
+		| {
+				matched: number;
+				/** What the run was sent, so a retry of what it missed keeps each
+				 *  id's account. Empty for an escalated run, which has no id list. */
+				sent: readonly BulkActionTarget[];
+				outcome?: BulkRunOutcome;
+				failureReason?: string;
+		  }
 		| undefined
 	>(undefined);
 	// The predicate the create chains its pass to. Undefined when the rule cannot
@@ -326,6 +332,16 @@ function SelectionWizardSession({
 		() => selection.map((message) => message.id),
 		[selection],
 	);
+	// What a bulk run over the ticked rows covers, each row still naming its
+	// account so the run can batch per account.
+	const bulkTargets = useMemo<BulkActionTarget[]>(
+		() =>
+			selection.map((message) => ({
+				id: message.id,
+				accountId: message.accountId,
+			})),
+		[selection],
+	);
 	const senders = useMemo(
 		() => selection.map((message) => message.email).filter(Boolean),
 		[selection],
@@ -586,19 +602,22 @@ function SelectionWizardSession({
 	}, [blockedReason, current, steps, goToStep]);
 
 	const runBulk = useCallback(
-		async (ids: readonly string[]) => {
+		async (targets: readonly BulkActionTarget[]) => {
 			const action = bulkActionFor(verb, named.moveMailboxId, junkMailboxId);
 			if (!action) {
 				setBulkRun({
-					matched: ids.length,
+					matched: targets.length,
+					sent: targets,
 					failureReason: noDestinationReason(verb),
 				});
 				return;
 			}
-			setBulkRun({ matched: ids.length });
-			const outcome = await runAction(action, [...ids]);
-			setBulkRun({ matched: ids.length, outcome });
-			if (walkedAway.current) onRunEnded?.(action.kind, ids.length, outcome);
+			setBulkRun({ matched: targets.length, sent: targets });
+			const outcome = await runAction(action, targets);
+			setBulkRun({ matched: targets.length, sent: targets, outcome });
+			if (walkedAway.current) {
+				onRunEnded?.(action.kind, targets.length, outcome);
+			}
 		},
 		[verb, named.moveMailboxId, junkMailboxId, runAction, onRunEnded],
 	);
@@ -612,13 +631,14 @@ function SelectionWizardSession({
 		if (!action) {
 			setBulkRun({
 				matched: escalated.total,
+				sent: [],
 				failureReason: noDestinationReason(verb),
 			});
 			return;
 		}
-		setBulkRun({ matched: escalated.total });
+		setBulkRun({ matched: escalated.total, sent: [] });
 		const outcome = await escalated.run(action);
-		setBulkRun({ matched: escalated.total, outcome });
+		setBulkRun({ matched: escalated.total, sent: [], outcome });
 		if (walkedAway.current) {
 			onRunEnded?.(action.kind, escalated.total, outcome);
 		}
@@ -670,7 +690,13 @@ function SelectionWizardSession({
 			startJob(organizeDraft);
 			return;
 		}
-		void runBulk(scope === "just-these" ? messageIds : matchedIds);
+		// A widened match is resolved by the account's own preview, so every id it
+		// returned belongs to the account the wizard is scoped to.
+		void runBulk(
+			scope === "just-these"
+				? bulkTargets
+				: matchedIds.map((id) => ({ id, accountId })),
+		);
 	}, [
 		escalated,
 		runEscalated,
@@ -678,7 +704,8 @@ function SelectionWizardSession({
 		named,
 		anchorMessageId,
 		verb,
-		messageIds,
+		accountId,
+		bulkTargets,
 		matchedIds,
 		createFilterAsync,
 		startJob,
@@ -850,8 +877,16 @@ function SelectionWizardSession({
 			sendCommit();
 			return;
 		}
-		const outstanding = bulkRun?.outcome?.failedIds ?? [];
-		void runBulk(outstanding.length > 0 ? outstanding : messageIds);
+		const outstanding = new Set(bulkRun?.outcome?.failedIds ?? []);
+		// A run hands back ids, and each one's account came from the batch it was
+		// sent in — so a retry re-sends the targets the run was given, filtered to
+		// what it never reached.
+		const sent = bulkRun?.sent ?? bulkTargets;
+		void runBulk(
+			outstanding.size > 0
+				? sent.filter((target) => outstanding.has(target.id))
+				: sent,
+		);
 	};
 
 	// Cancel rewinds the entries the wizard owns and leaves the selection where