@rapidmx/web-client 0.21.0 → 0.23.0

package/dist/apps/www/index.js

@@ -10,17 +10,18 @@ import { prefetchComposeWindow } from "../shared/components/mail/compose/Compose
 import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 import { HiOutlineFlag, HiOutlineLockClosed, HiOutlinePaperClip } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { archiveMessage, bulkUpdateMessages, createFolder, getMessage, getMessageRawContent, listFolders, listMessages, moveMessages, setMessagesFlagged, } from "@rapidmx/react-shared/mail/mailApi.js";
-import { listLabels } from "@rapidmx/react-shared/mail/labelsApi.js";
-import { listConversationMessages, listConversations, } from "@rapidmx/react-shared/mail/conversationsApi.js";
-import { search as searchMailbox } from "@rapidmx/react-shared/search/searchApi.js";
-import { parseSearchQuery } from "@rapidmx/react-shared/search/queryGrammar.js";
+import { ApiRequestError } from "../../lib/util/api.js";
+import { archiveMessage, bulkUpdateMessages, createFolder, getMessage, getMessageRawContent, listFolders, listMessages, moveMessages, setMessagesFlagged, } from "../../lib/mail/mailApi.js";
+import { listLabels } from "../../lib/mail/labelsApi.js";
+import { listConversationMessages, listConversations, } from "../../lib/mail/conversationsApi.js";
+import { search as searchMailbox } from "../../lib/search/searchApi.js";
+import { useApiClient } from "../../lib/util/apiClientContext.js";
+import { parseSearchQuery } from "../../lib/search/queryGrammar.js";
 import { searchLocalIndex } from "../shared/search/searchTier2.js";
 import { SEARCH_LIMITS, classifyFailure, describeFailures, hitKey, mergeSearchResults, runLimited, searchPageSize, tagHits, withTimeout, } from "../shared/search/crossMailboxSearch.js";
-import { getUnlockedKeys, subscribeKeySession } from "@rapidmx/react-shared/crypto/keySession.js";
-import { useMessageAttachments } from "@rapidmx/react-shared/mail/mailDetailHooks.js";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import { getUnlockedKeys, subscribeKeySession } from "../../lib/crypto/keySession.js";
+import { useMessageAttachments } from "../../lib/mail/mailDetailHooks.js";
+import useIsMobile from "../../lib/util/useIsMobile.js";
 import MailShell, { useMailShell, } from "../shared/components/mail/layout/MailShell.js";
 import MailAddress from "../shared/components/mail/MailAddress.js";
 import OutboxRowStatus from "../shared/components/mail/OutboxRowStatus.js";
@@ -31,6 +32,7 @@ import { setReadStateMany } from "../shared/mail/messageReadState.js";
 import { useMarkMessageRead } from "../shared/mail/useMarkMessageRead.js";
 import { ROW_FOCUS_CLASS, UnreadBar, UnreadLabel, dateClass, isUnread, rowClass, senderClass, subjectClass } from "../shared/components/mail/unreadStyle.js";
 import { LazyConversationThreadPane, LazyMessageDetailPane, prefetchReadingPane } from "../shared/components/mail/LazyReadingPane.js";
+import { rememberDecrypted } from "../shared/mail/decryptedMessages.js";
 import ConversationList, { conversationRowKey } from "../shared/components/mail/ConversationList.js";
 import SwipeRow from "../shared/components/mail/SwipeRow.js";
 import InviteRowChip from "../shared/components/mail/invite/InviteRowChip.js";
@@ -43,8 +45,8 @@ import { EMPTIABLE_FOLDER_TYPES } from "../shared/mail/permanentDelete.js";
 import { usePermanentDelete } from "../shared/mail/usePermanentDelete.js";
 import { useMailboxUpdateAccess } from "../shared/mail/useMailboxUpdateAccess.js";
 import { CONVERSATION_SORT_NOTE, CONVERSATION_SORT_UNAVAILABLE, MAIL_LIST_CLASSIFICATION_FILTERS, getMailListPreferences, setMailListPreferences, sortConversations, } from "../shared/components/mail/listPreferences.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Skeleton, { SkeletonList } from "@rapidmx/react-shared/components/feedback/Skeleton.js";
+import Alert from "../../lib/components/feedback/Alert.js";
+import Skeleton, { SkeletonList } from "../../lib/components/feedback/Skeleton.js";
 import { useUnlockPrompt } from "../shared/components/layout/UnlockPromptProvider.js";
 import { SHORTCUTS } from "../shared/keyboard/keymap.js";
 import { isActivatable } from "../shared/keyboard/targets.js";
@@ -94,12 +96,13 @@ async function decryptEncryptedRows(messages, unlocked) {
             const rawMime = await getMessageRawContent(message.uid);
             // Loaded here, on first use: the S/MIME code (PKI.js, ASN.1, X.509) is over half a megabyte and an inbox with
             // no encrypted mail in it never needs it.
-            const { evaluateMessageSecurity } = await (securityModule ?? (securityModule = import("@rapidmx/react-shared/crypto/messageSecurity.js")));
+            const { evaluateMessageSecurity } = await (securityModule ?? (securityModule = import("../../lib/crypto/messageSecurity.js")));
             const security = await evaluateMessageSecurity(rawMime, unlocked);
             if (!security.subject && !security.html) {
                 return null;
             }
             const preview = security.html ? stripHtmlToText(security.html).slice(0, LIST_PREVIEW_MAX_LENGTH) : undefined;
+            rememberDecrypted(message.uid, message.mailboxUid, { subject: security.subject, preview });
             return [message.uid, { subject: security.subject, preview }];
         }
         catch {
@@ -242,10 +245,10 @@ function mailboxesWithMore(cursor) {
  * (deleted after being indexed, or the fetch itself failed) is cached as `null` and dropped - the same
  * "a search hit can briefly outlive the message it points to" tolerance this function's inline
  * predecessor already had. */
-async function resolveHitsToMessages(hits, cache) {
+async function resolveHitsToMessages(hits, cache, client) {
     const toFetch = hits.filter((hit) => !cache.has(hit.entityUid));
     await Promise.all(toFetch.map(async (hit) => {
-        const message = await getMessage(hit.entityUid).catch(() => null);
+        const message = await getMessage(hit.entityUid, client).catch(() => null);
         cache.set(hit.entityUid, message);
     }));
     const messages = [];
@@ -334,7 +337,7 @@ function mergeInboxMessages(perMailbox) {
  * composite-cursor "load more" per mailbox is a natural v2 if usage shows people scrolling past the first
  * page in aggregate view often.
  */
-async function fetchAggregateMessages(mailboxFolders, type, filter) {
+async function fetchAggregateMessages(mailboxFolders, type, filter, client) {
     const perMailbox = await Promise.all(mailboxFolders.map(async ({ mailbox, folders }) => {
         const folder = folders.find((f) => f.type === type);
         if (!folder) {
@@ -344,7 +347,7 @@ async function fetchAggregateMessages(mailboxFolders, type, filter) {
         // this function's own pagination scope trim) - each mailbox contributes its own newest page and
         // they're merged newest-first, which a different sort key couldn't be made honest across an
         // arbitrary number of independently-paged folders.
-        const messages = await listMessages(folder.uid, { limit: MESSAGE_PAGE_SIZE, filter }).catch(() => []);
+        const messages = await listMessages(folder.uid, { limit: MESSAGE_PAGE_SIZE, filter }, client).catch(() => []);
         return { mailbox, messages };
     }));
     return mergeInboxMessages(perMailbox);
@@ -355,13 +358,13 @@ async function fetchAggregateMessages(mailboxFolders, type, filter) {
  * grouping pulls in) and each row tagged with its mailbox, then merged newest activity first. Same first-page-only scope, and the same
  * rule that a mailbox that has no such folder or fails to answer contributes nothing rather than blanking the rest.
  */
-async function fetchAggregateConversations(mailboxFolders, type, params) {
+async function fetchAggregateConversations(mailboxFolders, type, params, client) {
     const perMailbox = await Promise.all(mailboxFolders.map(async ({ mailbox, folders }) => {
         const folder = folders.find((f) => f.type === type);
         if (!folder) {
             return [];
         }
-        const rows = await listConversations(mailbox.uid, { ...params, folderUid: folder.uid, page: 0 }).catch(() => []);
+        const rows = await listConversations(mailbox.uid, { ...params, folderUid: folder.uid, page: 0 }, client).catch(() => []);
         return rows.map((row) => ({ ...row, mailboxUid: mailbox.uid }));
     }));
     return perMailbox.flat().sort((a, b) => Date.parse(b.latestDate) - Date.parse(a.latestDate));
@@ -390,6 +393,7 @@ function InboxContent({ userUid }) {
     const isMobile = useIsMobile();
     const navigate = useNavigate();
     const { requestUnlock } = useUnlockPrompt();
+    const client = useApiClient();
     const [messages, setMessages] = useState([]);
     const [conversations, setConversations] = useState([]);
     const [loading, setLoading] = useState(true);
@@ -748,7 +752,7 @@ function InboxContent({ userUid }) {
         }
         let cancelled = false;
         setOtherMailboxLabels([]);
-        listLabels(labelsMailboxUid, { limit: 200 })
+        listLabels(labelsMailboxUid, { limit: 200 }, client)
             .then((result) => {
             if (!cancelled) {
                 setOtherMailboxLabels(result);
@@ -758,11 +762,11 @@ function InboxContent({ userUid }) {
         return () => {
             cancelled = true;
         };
-    }, [labelsMailboxUid, otherMailbox]);
+    }, [labelsMailboxUid, otherMailbox, client]);
     useEffect(() => {
         let cancelled = false;
         setMailboxLabels([]);
-        listLabels(activeMailboxUid, { limit: 200 })
+        listLabels(activeMailboxUid, { limit: 200 }, client)
             .then((result) => {
             if (!cancelled) {
                 setMailboxLabels(result);
@@ -772,7 +776,7 @@ function InboxContent({ userUid }) {
         return () => {
             cancelled = true;
         };
-    }, [activeMailboxUid]);
+    }, [activeMailboxUid, client]);
     // Debounce the raw input into the query actually searched, so every keystroke doesn't fire a request.
     useEffect(() => {
         const handle = setTimeout(() => setSearchQuery(searchInput.trim()), SEARCH_DEBOUNCE_MS);
@@ -884,7 +888,7 @@ function InboxContent({ userUid }) {
             setLoading(true);
             setError(null);
             setHasMore(false);
-            void fetchAggregateConversations(mailboxFolders, aggregateFolderType, conversationParams(0))
+            void fetchAggregateConversations(mailboxFolders, aggregateFolderType, conversationParams(0), client)
                 .then((results) => {
                 if (isCurrentRun()) {
                     setConversations(results);
@@ -912,7 +916,7 @@ function InboxContent({ userUid }) {
                 setLoading(true);
             }
             setError(null);
-            listConversations(activeMailboxUid, conversationParams(0))
+            listConversations(activeMailboxUid, conversationParams(0), client)
                 .then((result) => {
                 if (isCurrentRun()) {
                     shownListKeyRef.current = listKey;
@@ -945,7 +949,7 @@ function InboxContent({ userUid }) {
             setLoading(true);
             setError(null);
             // hasMore stays false (set above) - see fetchAggregateMessages()'s own pagination scope trim.
-            void fetchAggregateMessages(mailboxFolders, aggregateFolderType, effectiveFilter)
+            void fetchAggregateMessages(mailboxFolders, aggregateFolderType, effectiveFilter, client)
                 .then((results) => {
                 if (isCurrentRun()) {
                     setMessages(results);
@@ -979,7 +983,7 @@ function InboxContent({ userUid }) {
             const isSuperseded = () => searchRunIdRef.current !== myRunId;
             // Tier 3's code, imported when the first mailbox needs it and shared by the rest.
             let tier3Module;
-            const loadTier3 = () => (tier3Module ?? (tier3Module = import("@rapidmx/react-shared/search/searchTier3.js")));
+            const loadTier3 = () => (tier3Module ?? (tier3Module = import("../../lib/search/searchTier3.js")));
             const failures = [];
             /** The failed mailbox's notice entry. A search of one mailbox has none: its failure fails the search. */
             const noteFailure = (uid, encrypted, err) => {
@@ -1021,7 +1025,7 @@ function InboxContent({ userUid }) {
                 const isUnconfirmed = (hit) => !!hit.metadataOnly && !confirmed.has(hitKey(hit));
                 const effectiveTier1 = capped.filter((hit) => !runs.get(hit.mailboxUid).tier3Settled || !isUnconfirmed(hit));
                 const merged = mergeSearchResults(effectiveTier1, tier2Hits, tier3Hits).slice(0, rowCap);
-                const { messages: resolved, snippets: resolvedSnippets } = await resolveHitsToMessages(merged, resolvedMessageCacheRef.current);
+                const { messages: resolved, snippets: resolvedSnippets } = await resolveHitsToMessages(merged, resolvedMessageCacheRef.current, client);
                 if (isSuperseded() || revealId < revealsApplied) {
                     return;
                 }
@@ -1047,7 +1051,7 @@ function InboxContent({ userUid }) {
                         const run = runs.get(uid);
                         try {
                             const [tier1Page, tier2Page] = await Promise.all([
-                                withTimeout(searchMailbox(parsed.text, tier1SearchParams(parsed, undefined, uid, pageSize)), tier1TimeoutMs),
+                                withTimeout(searchMailbox(parsed.text, tier1SearchParams(parsed, undefined, uid, pageSize), client), tier1TimeoutMs),
                                 searchLocalIndex(uid, parsed, run.unlocked, pageSize, 0),
                             ]);
                             if (isSuperseded()) {
@@ -1156,7 +1160,7 @@ function InboxContent({ userUid }) {
             shownListKeyRef.current = listKey;
             pendingScrollRef.current = snapshot.scrollTop;
         }
-        listMessages(folderUid, listParams)
+        listMessages(folderUid, listParams, client)
             .then((results) => {
             if (isCurrentRun()) {
                 shownListKeyRef.current = listKey;
@@ -1213,6 +1217,7 @@ function InboxContent({ userUid }) {
         crossMailbox,
         searchTargetKey,
         activeMailboxUid,
+        client,
     ]);
     // Which folders the messages on screen live in: one the sidebar does not know (the Outbox and Sent Items are made by the server on first use) is looked for -
     // its mailbox's folders are listed again, once - so it appears without a reload. A conversation names every folder it has a message in.
@@ -1246,13 +1251,13 @@ function InboxContent({ userUid }) {
             try {
                 if (asConversations && aggregateFolderType) {
                     // No paging here either: the fresh merged first pages are the list.
-                    const fresh = await fetchAggregateConversations(mailboxFolders, aggregateFolderType, conversationParams(0));
+                    const fresh = await fetchAggregateConversations(mailboxFolders, aggregateFolderType, conversationParams(0), client);
                     if (isCurrent()) {
                         setConversations(fresh);
                     }
                 }
                 else if (asConversations) {
-                    const fresh = await listConversations(activeMailboxUid, conversationParams(0));
+                    const fresh = await listConversations(activeMailboxUid, conversationParams(0), client);
                     if (!isCurrent()) {
                         return;
                     }
@@ -1263,13 +1268,13 @@ function InboxContent({ userUid }) {
                 }
                 else if (aggregateFolderType) {
                     // No paging here (see `fetchAggregateMessages()`): the fresh merged first pages are the list.
-                    const fresh = await fetchAggregateMessages(mailboxFolders, aggregateFolderType, effectiveFilter);
+                    const fresh = await fetchAggregateMessages(mailboxFolders, aggregateFolderType, effectiveFilter, client);
                     if (isCurrent()) {
                         setMessages(fresh);
                     }
                 }
                 else {
-                    const fresh = await listMessages(folderUid, listParams);
+                    const fresh = await listMessages(folderUid, listParams, client);
                     if (!isCurrent()) {
                         return;
                     }
@@ -1340,7 +1345,7 @@ function InboxContent({ userUid }) {
         try {
             if (asConversations) {
                 const page = Math.floor(listedOffsetRef.current / MESSAGE_PAGE_SIZE);
-                const more = await listConversations(activeMailboxUid, conversationParams(page));
+                const more = await listConversations(activeMailboxUid, conversationParams(page), client);
                 if (!isCurrentRun()) {
                     return;
                 }
@@ -1362,7 +1367,7 @@ function InboxContent({ userUid }) {
                     const mailboxCursor = cursor.perMailbox.get(uid);
                     try {
                         const [tier1Page, tier2Page] = await Promise.all([
-                            withTimeout(searchMailbox(parsed.text, tier1SearchParams(parsed, mailboxCursor.tier1Cursor, uid, cursor.pageSize)), tier1TimeoutMs),
+                            withTimeout(searchMailbox(parsed.text, tier1SearchParams(parsed, mailboxCursor.tier1Cursor, uid, cursor.pageSize), client), tier1TimeoutMs),
                             searchLocalIndex(uid, parsed, getUnlockedKeys(uid), cursor.pageSize, mailboxCursor.tier2Offset),
                         ]);
                         // The first page cached this pass under `tier3Key` before it created the cursor - unless Tier 3 had nothing to give.
@@ -1405,7 +1410,7 @@ function InboxContent({ userUid }) {
                 // confirms simply keeps showing its existing placeholder text rather than a live skeleton
                 // - a deliberate, documented scope trim of progressive reveal to the first page only.
                 const merged = mergeSearchResults(capSkeletons(answered.flatMap((page) => page.tier1)), answered.flatMap((page) => page.tier2), answered.flatMap((page) => page.tier3));
-                const { messages: more, snippets: moreSnippets } = await resolveHitsToMessages(merged, resolvedMessageCacheRef.current);
+                const { messages: more, snippets: moreSnippets } = await resolveHitsToMessages(merged, resolvedMessageCacheRef.current, client);
                 if (!isCurrentRun()) {
                     return;
                 }
@@ -1443,7 +1448,7 @@ function InboxContent({ userUid }) {
                 // no longer a page boundary, so this page overlaps rows already shown - `appendUnseenRows()`
                 // drops those - rather than skipping the message that shifted back across the boundary.
                 const page = Math.floor(listedOffsetRef.current / MESSAGE_PAGE_SIZE);
-                const more = await listMessages(folderUid, { ...listParams, page });
+                const more = await listMessages(folderUid, { ...listParams, page }, client);
                 if (!isCurrentRun()) {
                     return;
                 }
@@ -1479,6 +1484,7 @@ function InboxContent({ userUid }) {
         activeMailboxUid,
         crossMailbox,
         searchTargetKey,
+        client,
     ]);
     // Always calls the latest `loadMore` closure so the effect below doesn't need `loadMore` itself in its
     // dependency array (it changes on every keystroke/page load, which would otherwise mean nothing here).
@@ -1623,7 +1629,7 @@ function InboxContent({ userUid }) {
         }
         setResolvingSelection((n) => n + 1);
         try {
-            const loaded = await Promise.all(missing.map(async (id) => [id, await listConversationMessages(activeMailboxUid, id)]));
+            const loaded = await Promise.all(missing.map(async (id) => [id, await listConversationMessages(activeMailboxUid, id, {}, client)]));
             setConversationMessagesById((prev) => ({ ...prev, ...Object.fromEntries(loaded) }));
         }
         catch (err) {
@@ -1726,11 +1732,11 @@ function InboxContent({ userUid }) {
         return inEachMailbox(chosen, async (ofMailbox, group) => {
             const archiveFolderUid = foldersOf(ofMailbox).find((f) => f.type === "archive")?.uid;
             if (archiveFolderUid) {
-                return moveMessages(group, archiveFolderUid);
+                return moveMessages(group, archiveFolderUid, client);
             }
-            const first = await archiveMessage(group[0].uid);
+            const first = await archiveMessage(group[0].uid, client);
             const rest = group.slice(1);
-            return rest.length === 0 ? [first] : [first, ...(await moveMessages(rest, first.folderUid))];
+            return rest.length === 0 ? [first] : [first, ...(await moveMessages(rest, first.folderUid, client))];
         });
     }
     /**
@@ -1760,19 +1766,19 @@ function InboxContent({ userUid }) {
         if (known) {
             return known;
         }
-        const listed = (await listFolders(ofMailbox)).find((f) => f.type === type);
+        const listed = (await listFolders(ofMailbox, client)).find((f) => f.type === type);
         if (listed) {
             onFolderCreated(listed);
             lazyFoldersRef.current.set(key, listed.uid);
             return listed.uid;
         }
-        const created = await createFolder({ mailboxUid: ofMailbox, name, type });
+        const created = await createFolder({ mailboxUid: ofMailbox, name, type }, client);
         lazyFoldersRef.current.set(key, created.uid);
         return created.uid;
     }
     /** Moves `chosen` into each of its mailbox's own folder of `type` (Deleted Items, Junk), making it where the server has none yet. */
     function moveToFolderOfType(chosen, type, name) {
-        return inEachMailbox(chosen, async (ofMailbox, group) => moveMessages(group, await resolveFolderOfType(type, name, ofMailbox)));
+        return inEachMailbox(chosen, async (ofMailbox, group) => moveMessages(group, await resolveFolderOfType(type, name, ofMailbox), client));
     }
     /**
      * Sets every selected message's labels in one bulk update: each ends up with `labelUids`, plus the
@@ -1786,7 +1792,7 @@ function InboxContent({ userUid }) {
         void runBulkAction((chosen) => bulkUpdateMessages(chosen.map((message) => {
             const kept = (message.labelUids ?? []).filter((uid) => keepPartial.includes(uid) || !mailboxLabels.some((label) => label.uid === uid));
             return { uid: message.uid, version: message.version, labelUids: [...new Set([...labelUids, ...kept])] };
-        })), false);
+        }), client), false);
     }
     function moveSelectionToType(type, name, chosen) {
         return runBulkAction((moving) => moveToFolderOfType(moving, type, name), true, chosen);
@@ -1871,7 +1877,7 @@ function InboxContent({ userUid }) {
             setMoveDialog(null);
             return;
         }
-        await runBulkAction((moving) => moveMessages(moving, folderUidToMoveTo), true, chosen);
+        await runBulkAction((moving) => moveMessages(moving, folderUidToMoveTo, client), true, chosen);
         setMoveDialog(null);
     }
     const loadMoreStatus = loadingMore ? ("Loading more\u2026") : loadMoreError ? (_jsxs("span", { className: "inline-flex items-center gap-2", children: [_jsx("span", { role: "alert", className: "text-danger", children: loadMoreError }), _jsx("button", { type: "button", onClick: () => void loadMoreRef.current(), className: "text-primary-dark hover:underline font-medium", children: "Retry" })] })) : loadMoreStalled ? (_jsx("button", { type: "button", onClick: () => void loadMoreRef.current(), className: "text-primary-dark hover:underline font-medium", children: "Load more" })) : null;
@@ -2009,7 +2015,7 @@ function InboxContent({ userUid }) {
         const cacheKey = ofMailbox === activeMailboxUid ? id : `${ofMailbox}\u0000${id}`;
         let all = conversationMessagesById[cacheKey];
         if (!all) {
-            all = await listConversationMessages(ofMailbox, id);
+            all = await listConversationMessages(ofMailbox, id, {}, client);
             const loaded = all;
             setConversationMessagesById((prev) => ({ ...prev, [cacheKey]: loaded }));
         }
@@ -2072,16 +2078,24 @@ function InboxContent({ userUid }) {
         }
         await actOnKeyboardTargets(targets.filter((message) => !inDeletedItems(message)), (chosen) => moveToFolderOfType(chosen, "deleted_items", "Deleted Items"), true);
     }
+    /** Shift+Delete, from the keyboard: permanently deletes the targets wherever they are, after the same confirmation as Delete in Deleted Items. */
+    async function permanentDeleteFromKeyboard() {
+        const targets = await keyboardTargets();
+        if (targets.length > 0 && (await purgeChosen(targets)) && threadPane && !selectMode) {
+            closeOpenThread();
+        }
+    }
     useShortcut(SHORTCUTS.mail.next, () => selectNeighbour(1), { enabled: canMoveSelection });
     useShortcut(SHORTCUTS.mail.previous, () => selectNeighbour(-1), { enabled: canMoveSelection });
     useShortcut(SHORTCUTS.mail.nextUnread, () => selectNextUnread(1), { enabled: canMoveSelection });
     useShortcut(SHORTCUTS.mail.previousUnread, () => selectNextUnread(-1), { enabled: canMoveSelection });
     useShortcut(SHORTCUTS.mail.delete, () => void deleteFromKeyboard(), { enabled: keyboardActions && keyboardTargetExists });
+    useShortcut(SHORTCUTS.mail.permanentDelete, () => void permanentDeleteFromKeyboard(), { enabled: keyboardActions && keyboardTargetExists });
     useShortcut(SHORTCUTS.mail.markRead, () => void runOnKeyboardTargets((chosen) => setReadStateMany(chosen, true, { patch: patchListedMessage, track: trackMessageChange }), false, isUnread), { enabled: keyboardActions && keyboardTargetExists });
     useShortcut(SHORTCUTS.mail.markUnread, () => void runOnKeyboardTargets((chosen) => setReadStateMany(chosen, false, { patch: patchListedMessage, track: trackMessageChange }), false, (message) => !isUnread(message)), { enabled: keyboardActions && keyboardTargetExists });
     useShortcut(SHORTCUTS.mail.flag, () => 
     // Flags them all unless every one already is - what the bar's Flag and Unflag would do on this selection.
-    void runOnKeyboardTargets((chosen) => setMessagesFlagged(chosen, !chosen.every((m) => m.flags.flagged)), false), { enabled: keyboardActions && keyboardTargetExists });
+    void runOnKeyboardTargets((chosen) => setMessagesFlagged(chosen, !chosen.every((m) => m.flags.flagged), client), false), { enabled: keyboardActions && keyboardTargetExists });
     useShortcut(SHORTCUTS.mail.open, (event) => {
         // Enter on a row that is not selected yet is the row button's own click (it selects). On the selected one - or with the focus
         // elsewhere - it opens the message on its own page, as it does in Outlook.
@@ -2146,8 +2160,8 @@ function InboxContent({ userUid }) {
                             ? selectAllConversations()
                             : setSelectedUids(new Set(messages.map((m) => m.uid))), onClearSelection: () => asConversations ? setSelectedConversationIds(new Set()) : setSelectedUids(new Set()), onCancel: leaveSelectMode, folders: foldersOf(selectionMailboxUid), currentFolderUid: folderUid, labels: mailboxLabels, mailboxUid: selectionMailboxUid, moveDisabledReason: moveDisabledReason, labelsDisabledReason: labelsDisabledReason, onLabelCreated: (label) => setMailboxLabels((prev) => [...prev, label]), onFolderCreated: onFolderCreated, onApplyLabels: applyLabelsToSelection, onSetRead: (read) => void runBulkAction(
                         // Optimistic: the rows and the folder badges change now, and change back if the server refuses.
-                        (chosen) => setReadStateMany(chosen, read, { patch: patchListedMessage, track: trackMessageChange }), false), onSetFlagged: (flagged) => void runBulkAction((chosen) => setMessagesFlagged(chosen, flagged), false), shortcuts: keyboardActions, onArchive: () => void runBulkAction(bulkArchive, true), onMoveTo: async (targetFolderUid) => {
-                            await runBulkAction((chosen) => moveMessages(chosen, targetFolderUid), true);
+                        (chosen) => setReadStateMany(chosen, read, { patch: patchListedMessage, track: trackMessageChange }), false), onSetFlagged: (flagged) => void runBulkAction((chosen) => setMessagesFlagged(chosen, flagged, client), false), shortcuts: keyboardActions, onArchive: () => void runBulkAction(bulkArchive, true), onMoveTo: async (targetFolderUid) => {
+                            await runBulkAction((chosen) => moveMessages(chosen, targetFolderUid, client), true);
                         }, onReportJunk: () => void moveSelectionToType("junk", "Junk Email"), onDelete: () => void (deletesPermanently
                             ? purgeChosen(selectedMessages)
                             : // A mix (search results from several folders) moves only what is not in Deleted Items yet.

package/dist/apps/www/messages/[uid].d.ts

@@ -14,5 +14,5 @@ declare function MessageDetailPage(props: MailShellProps & {
 export default MessageDetailPage;
 /** The tab's title: `Brand: Mail` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;

package/dist/apps/www/messages/[uid].js

@@ -5,16 +5,17 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../shared/navigation/pageTitle.js";
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { getMessage } from "@rapidmx/react-shared/mail/mailApi.js";
-import { listLabels } from "@rapidmx/react-shared/mail/labelsApi.js";
-import { useMessageAttachments } from "@rapidmx/react-shared/mail/mailDetailHooks.js";
+import { ApiRequestError } from "../../../lib/util/api.js";
+import { getMessage } from "../../../lib/mail/mailApi.js";
+import { listLabels } from "../../../lib/mail/labelsApi.js";
+import { useMessageAttachments } from "../../../lib/mail/mailDetailHooks.js";
+import { useApiClient } from "../../../lib/util/apiClientContext.js";
 import { useMarkMessageRead } from "../../shared/mail/useMarkMessageRead.js";
 import MailShell, { useMailShell } from "../../shared/components/mail/layout/MailShell.js";
 import { LazyConversationThreadPane, LazyMessageDetailPane } from "../../shared/components/mail/LazyReadingPane.js";
 import { useSearchParams } from "@rapidrest/react/client";
 import { ReadingPaneSkeleton } from "../../shared/components/mail/reading/MessageCard.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
+import Alert from "../../../lib/components/feedback/Alert.js";
 /**
  * Only reached on mobile (below the `md` breakpoint) — desktop's `apps/www/index.tsx` keeps its existing
  * inline reading pane and never navigates here; see that file's `handleSelect`. A row of the conversation list
@@ -26,6 +27,7 @@ function MessageDetailPage(props) {
 }
 function MessageDetailContent({ uid }) {
     const { mailboxFolders, mailboxUid, onFolderCreated } = useMailShell();
+    const client = useApiClient();
     const [message, setMessage] = useState(null);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);
@@ -34,11 +36,11 @@ function MessageDetailContent({ uid }) {
     useEffect(() => {
         setLoading(true);
         setError(null);
-        getMessage(uid)
+        getMessage(uid, client)
             .then(setMessage)
             .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load this message."))
             .finally(() => setLoading(false));
-    }, [uid]);
+    }, [uid, client]);
     // See `apps/www/index.tsx`'s identical effect's own doc comment - a failure here just hides the
     // Labels control rather than blocking the rest of the page. Keyed on the message's own mailbox, not the
     // shell's ambient one: this route is reached from aggregate/search rows too, where they can differ.
@@ -48,7 +50,7 @@ function MessageDetailContent({ uid }) {
             return;
         }
         let cancelled = false;
-        listLabels(messageMailboxUid, { limit: 200 })
+        listLabels(messageMailboxUid, { limit: 200 }, client)
             .then((result) => {
             if (!cancelled) {
                 setLabels(result);
@@ -58,7 +60,7 @@ function MessageDetailContent({ uid }) {
         return () => {
             cancelled = true;
         };
-    }, [messageMailboxUid]);
+    }, [messageMailboxUid, client]);
     // A thread loads, marks read and fetches the attachments of each message it opens itself.
     const attachments = useMessageAttachments(conversationId ? null : message);
     useMarkMessageRead(conversationId ? null : message, setMessage);

package/dist/apps/www/settings/appearance/index.d.ts

@@ -6,5 +6,5 @@ declare function SettingsAppearancePage(props: SettingsAppearancePageProps): Rea
 export default SettingsAppearancePage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;

package/dist/apps/www/settings/auto-reply/index.d.ts

@@ -5,5 +5,5 @@ declare function SettingsAutoReplyPage(props: SettingsAutoReplyPageProps): React
 export default SettingsAutoReplyPage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;

package/dist/apps/www/settings/auto-reply/index.js

@@ -5,10 +5,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import { useState } from "react";
-import { toDatetimeLocal } from "@rapidmx/react-shared/util/dateInput.js";
-import { updateMailbox } from "@rapidmx/react-shared/mail/mailApi.js";
+import { toDatetimeLocal } from "../../../../lib/util/dateInput.js";
+import { updateMailbox } from "../../../../lib/mail/mailApi.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import SettingsShell, { useSettingsShell } from "../../../shared/components/settings/layout/SettingsShell.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import Button from "../../../../lib/components/buttons/Button.js";
 import { notifyApiError } from "../../../shared/notifications/apiErrors.js";
 const INPUT_CLASS = "w-full text-sm py-2 px-3 border border-border rounded-sm bg-surface text-text focus:outline-none focus:border-primary";
 function SettingsAutoReplyPage(props) {
@@ -20,6 +21,7 @@ function AutoReplyContent() {
     // resolved to one of them (a mailbox-less caller sees `MailboxProvisioning` instead) — this lookup
     // can't miss, same established non-null pattern as `apps/www/contacts/index.tsx`'s `mailboxUid!`.
     const mailbox = mailboxes.find((mb) => mb.uid === mailboxUid);
+    const client = useApiClient();
     const [oofEnabled, setOofEnabled] = useState(mailbox.oofEnabled ?? false);
     const [oofMessage, setOofMessage] = useState(mailbox.oofMessage ?? "");
     const [oofStartTime, setOofStartTime] = useState(mailbox.oofStartTime ? toDatetimeLocal(mailbox.oofStartTime) : "");
@@ -42,7 +44,7 @@ function AutoReplyContent() {
                 // `null` (not omitted) clears a previously saved window - an omitted field is left as-is.
                 oofStartTime: oofStartTime ? new Date(oofStartTime).toISOString() : null,
                 oofEndTime: oofEndTime ? new Date(oofEndTime).toISOString() : null,
-            });
+            }, client);
             setVersion(updated.version);
             setSaved(true);
         }

package/dist/apps/www/settings/blocked-senders/index.d.ts

@@ -5,5 +5,5 @@ declare function SettingsBlockedSendersPage(props: SettingsBlockedSendersPagePro
 export default SettingsBlockedSendersPage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;

package/dist/apps/www/settings/blocked-senders/index.js

@@ -5,10 +5,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { pageTitle } from "../../../shared/navigation/pageTitle.js";
 import { useId, useRef, useState } from "react";
-import { blockedSendersOf, isSharedWithMe, safeSendersOf } from "@rapidmx/react-shared/mail/mailApi.js";
-import { MAX_SENDER_LIST_ENTRIES, addBlockedSender, addSafeSender, checkSenderEntry, removeBlockedSender, removeSafeSender, } from "@rapidmx/react-shared/mail/senderListsApi.js";
+import { blockedSendersOf, isSharedWithMe, safeSendersOf } from "../../../../lib/mail/mailApi.js";
+import { MAX_SENDER_LIST_ENTRIES, addBlockedSender, addSafeSender, checkSenderEntry, removeBlockedSender, removeSafeSender, } from "../../../../lib/mail/senderListsApi.js";
 import SettingsShell, { useSettingsShell } from "../../../shared/components/settings/layout/SettingsShell.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import Button from "../../../../lib/components/buttons/Button.js";
+import { useApiClient } from "../../../../lib/util/apiClientContext.js";
 import { useMailboxUpdateAccess } from "../../../shared/mail/useMailboxUpdateAccess.js";
 import { notifyApiError } from "../../../shared/notifications/apiErrors.js";
 function SettingsBlockedSendersPage(props) {
@@ -105,6 +106,7 @@ function ListsContent() {
     // `SettingsShell` only ever renders its children once `mailboxes` has loaded and `mailboxUid` has resolved to one of them - same established
     // non-null pattern as `apps/www/settings/read-receipts/index.tsx`.
     const mailbox = mailboxes.find((mb) => mb.uid === mailboxUid);
+    const client = useApiClient();
     const writable = useMailboxUpdateAccess(mailbox);
     // The lists are the owner's (and a manager's) to change; the server does not say which of the two a delegate is, so one who may update is offered the
     // forms and told what a refusal means.
@@ -127,7 +129,7 @@ function ListsContent() {
             return undefined;
         }
     }
-    return (_jsx("div", { className: "flex-1 min-w-0 overflow-y-auto p-4 sm:p-6", children: _jsxs("div", { className: "max-w-4xl", children: [_jsx("h1", { className: "text-lg font-bold tracking-tight mb-1", children: "Blocked and safe senders" }), _jsxs("p", { className: "text-sm text-text-muted mb-4", children: ["These lists belong to ", _jsx("span", { className: "font-medium text-text", children: mailbox.displayName }), " (", mailbox.primarySmtpAddress, "). Each entry is an email address or a domain. An entry is on one list at a time: adding it to one takes it off the other."] }), !supported ? (_jsx("p", { role: "status", className: "text-sm text-text-muted", children: "This server does not support blocked and safe senders yet." })) : (_jsxs(_Fragment, { children: [!writable && (_jsx("p", { role: "status", className: "text-sm rounded-md border border-border bg-surface-alt px-3 py-2 mb-4", children: "You have view-only access to this mailbox, so you can see these lists but not change them." })), writable && delegated && (_jsx("p", { className: "text-sm text-text-muted mb-4", children: "Only this mailbox\u2019s owner, or someone with full access to it, can change these lists. If you cannot, the server says so when you try." })), _jsxs("div", { className: "grid gap-4 md:grid-cols-2", children: [_jsx(ListSection, { kind: "blocked", entries: blocked, otherEntries: safe, ownAddresses: ownAddresses, editable: writable, onAdd: (entry) => change(() => addBlockedSender(mailbox.uid, entry), "Couldn't block this sender"), onRemove: (entry) => change(() => removeBlockedSender(mailbox.uid, entry), "Couldn't unblock this sender") }), _jsx(ListSection, { kind: "safe", entries: safe, otherEntries: blocked, ownAddresses: ownAddresses, editable: writable, onAdd: (entry) => change(() => addSafeSender(mailbox.uid, entry), "Couldn't add this safe sender"), onRemove: (entry) => change(() => removeSafeSender(mailbox.uid, entry), "Couldn't remove this safe sender") })] })] }))] }) }));
+    return (_jsx("div", { className: "flex-1 min-w-0 overflow-y-auto p-4 sm:p-6", children: _jsxs("div", { className: "max-w-4xl", children: [_jsx("h1", { className: "text-lg font-bold tracking-tight mb-1", children: "Blocked and safe senders" }), _jsxs("p", { className: "text-sm text-text-muted mb-4", children: ["These lists belong to ", _jsx("span", { className: "font-medium text-text", children: mailbox.displayName }), " (", mailbox.primarySmtpAddress, "). Each entry is an email address or a domain. An entry is on one list at a time: adding it to one takes it off the other."] }), !supported ? (_jsx("p", { role: "status", className: "text-sm text-text-muted", children: "This server does not support blocked and safe senders yet." })) : (_jsxs(_Fragment, { children: [!writable && (_jsx("p", { role: "status", className: "text-sm rounded-md border border-border bg-surface-alt px-3 py-2 mb-4", children: "You have view-only access to this mailbox, so you can see these lists but not change them." })), writable && delegated && (_jsx("p", { className: "text-sm text-text-muted mb-4", children: "Only this mailbox\u2019s owner, or someone with full access to it, can change these lists. If you cannot, the server says so when you try." })), _jsxs("div", { className: "grid gap-4 md:grid-cols-2", children: [_jsx(ListSection, { kind: "blocked", entries: blocked, otherEntries: safe, ownAddresses: ownAddresses, editable: writable, onAdd: (entry) => change(() => addBlockedSender(mailbox.uid, entry, client), "Couldn't block this sender"), onRemove: (entry) => change(() => removeBlockedSender(mailbox.uid, entry, client), "Couldn't unblock this sender") }), _jsx(ListSection, { kind: "safe", entries: safe, otherEntries: blocked, ownAddresses: ownAddresses, editable: writable, onAdd: (entry) => change(() => addSafeSender(mailbox.uid, entry, client), "Couldn't add this safe sender"), onRemove: (entry) => change(() => removeSafeSender(mailbox.uid, entry, client), "Couldn't remove this safe sender") })] })] }))] }) }));
 }
 export default SettingsBlockedSendersPage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */

package/dist/apps/www/settings/encryption/index.d.ts

@@ -8,5 +8,5 @@ declare function SettingsEncryptionPage(props: SettingsEncryptionPageProps): Rea
 export default SettingsEncryptionPage;
 /** The tab's title: `Brand: Settings` (see `pageTitle()`). */
 export declare const title: (props: {
-    branding?: Pick<import("@rapidmx/react-shared/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
+    branding?: Pick<import("../../../../lib/branding/brandingApi.js").Branding, "title" | "companyName"> | null;
 }) => string;