@remit/web-client 0.0.247 → 0.0.249

package/package.json

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

@@ -12,9 +12,16 @@
  * the `MailHeader` + filter expando; the kit `MessageListPane` (flat, no
  * `briefFilters`) owns the loading / empty / error chrome and keyboard hints,
  * with a consumer-supplied `listBody` so the real rows render at every width.
+ *
+ * The category and attribute chips are query parameters, and the header's
+ * unread count is the server's own (#308). Both used to be computed over the
+ * pages the user happened to have loaded, so a category whose mail sat below
+ * the newest page showed an empty list, and the count grew with every press of
+ * "load more" while being presented as a total.
  */
 import {
 	flaggedFilterConfig,
+	type MessageListFilter,
 	MessageListPane,
 	type SearchResult,
 	type ThreadRowData,
@@ -24,14 +31,21 @@ import { type RefObject, useCallback, useMemo, useState } from "react";
 import { formatErrorMessage } from "@/components/ui/ErrorState";
 import { useIsDesktop } from "@/hooks/useMediaQuery";
 import { useSearchTokenContext } from "@/hooks/useSearchTokenContext";
-import { useStarredThreads } from "@/hooks/useStarredThreads";
+import {
+	useStarredTextSearch,
+	useStarredThreads,
+	useStarredUnreadCount,
+} from "@/hooks/useStarredThreads";
 import type { TriageContextUpdate } from "@/hooks/useTriageLayer";
 import {
 	matchesBriefSearch,
 	matchesSearchTokens,
+	mergeSearchRows,
 	toThreadRowData,
 } from "@/lib/brief";
 import { buildBugReportContext, buildGitHubIssueUrl } from "@/lib/bug-report";
+import { flaggedCriteria } from "@/lib/flagged-criteria";
+import { categoryLabel } from "@/lib/inbox-filters";
 import { useListHeaderChrome } from "@/lib/list-header-chrome";
 import { useMailContext } from "@/lib/mail-context";
 import { rowToSearchResult } from "@/lib/search-result";
@@ -51,10 +65,8 @@ import {
 	useThreadListSelection,
 } from "./ThreadListInteraction";
 
-const FILTER_PREDICATES: Record<string, (t: ThreadRowData) => boolean> = {
-	unread: (t) => !t.isRead,
-	attachment: (t) => t.hasAttachment === true,
-};
+/** One page of the server-filtered text search, merged with the listing below. */
+const TEXT_SEARCH_PAGE_SIZE = 200;
 
 /**
  * The wizard this view's verbs walk, and the one its search entry lands on.
@@ -138,6 +150,26 @@ export function FlaggedList({
 		setActiveFilters(new Set());
 	}, []);
 
+	const { freeText: sq, tokens: queryTokens } = parseSearchTokens(
+		searchQuery.trim().toLowerCase(),
+		tokenContext,
+	);
+
+	// The chips and the tokens together, as query parameters: a category typed as
+	// `category:personal` narrows the request exactly as the chip does.
+	const { criteria, residual: residualTokens } = useMemo(
+		() =>
+			flaggedCriteria(
+				{ category: selectedCategory, attributes: activeFilters },
+				queryTokens,
+			),
+		[selectedCategory, activeFilters, queryTokens],
+	);
+	const textCriteria = useMemo(
+		() => (sq ? { ...criteria, query: sq } : criteria),
+		[criteria, sq],
+	);
+
 	const {
 		threads,
 		isLoading,
@@ -147,27 +179,27 @@ export function FlaggedList({
 		fetchNextPage,
 		hasNextPage,
 		isFetchingNextPage,
-	} = useStarredThreads();
-
-	const { freeText: sq, tokens: queryTokens } = parseSearchTokens(
-		searchQuery.trim().toLowerCase(),
-		tokenContext,
-	);
+	} = useStarredThreads(criteria);
+	const textMatches = useStarredTextSearch(textCriteria, TEXT_SEARCH_PAGE_SIZE);
 
 	const rows = useMemo<ThreadRowData[]>(() => {
-		const predicates = Array.from(activeFilters)
-			.map((id) => FILTER_PREDICATES[id])
-			.filter((p): p is (t: ThreadRowData) => boolean => p != null);
-		return dedupeByThread(threads)
-			.map(toThreadRowData)
-			.filter(
-				(t) =>
-					(selectedCategory === "all" || t.category === selectedCategory) &&
-					predicates.every((p) => p(t)) &&
-					(!sq || matchesBriefSearch(t, sq)) &&
-					matchesSearchTokens(t, queryTokens),
-			);
-	}, [threads, selectedCategory, activeFilters, sq, queryTokens]);
+		const listed = dedupeByThread(threads).map(toThreadRowData);
+		// No free text: the server-filtered listing as it comes.
+		const matched = sq
+			? mergeSearchRows(
+					// The snippet half, over the rows already loaded. It only ever adds
+					// to the server's set — it is never what decides membership.
+					listed.filter((t) => matchesBriefSearch(t, sq)),
+					dedupeByThread(textMatches).map(toThreadRowData),
+				)
+			: listed;
+		// What is left is what no parameter can carry: `before:`, `after:`, `in:`,
+		// `account:`, and a token the chips overruled. The collapse runs last so
+		// the two halves of a text search cannot land one conversation twice.
+		return dedupeByThread(matched).filter((t) =>
+			matchesSearchTokens(t, residualTokens),
+		);
+	}, [threads, textMatches, sq, residualTokens]);
 
 	const openRow = useCallback(
 		(id: string, options?: OpenMessageOptions) => {
@@ -197,10 +229,24 @@ export function FlaggedList({
 		[rows, resultFolderIndex],
 	);
 
-	const unreadCount = useMemo(
-		() => rows.filter((t) => !t.isRead).length,
-		[rows],
-	);
+	// The server's count over the whole collection under the active criteria.
+	// `null` while it is in flight and `null` when it cannot be had, and the
+	// header then shows no number — never a page length dressed as a total.
+	const unreadCount = useStarredUnreadCount(textCriteria) ?? null;
+
+	// An empty list has to say how much was looked at, and the answer comes off
+	// the request. Every chip and every carried token is a column on the row, so
+	// the server answered over the whole collection; a residual token, or the
+	// snippet half of a free-text search, only ever saw the pages loaded so far.
+	const filterLabel = categoryLabel(selectedCategory);
+	const listFilter: MessageListFilter | undefined = filterLabel
+		? {
+				label: filterLabel,
+				reach:
+					residualTokens.length > 0 || sq ? "loaded-pages" : "whole-folder",
+				onClear: clearFilters,
+			}
+		: undefined;
 
 	const listState = isLoading
 		? "loading"
@@ -277,6 +323,10 @@ export function FlaggedList({
 					flatList
 					hideHeader
 					listState={chrome.searchResults ? "ready" : listState}
+					listFilter={listFilter}
+					// Flagged spans accounts and folders, so it is a collection and
+					// never "this mailbox". It names itself.
+					listScopeLabel="Starred"
 					searchQuery={sq ? searchQuery : undefined}
 					errorMessage={isError ? formatErrorMessage(error) : undefined}
 					onRetry={() => refetch()}

package/src/components/mail/MailListHeader.tsx

@@ -95,7 +95,13 @@ import {
 
 export interface MailListHeaderProps {
 	title: string;
-	unreadCount: number;
+	/**
+	 * Unread count beside the title. `null` is the one way to say the number is
+	 * not known, and the header then shows none: a count the server has not
+	 * answered is never replaced by a figure derived from the rows that happen to
+	 * be loaded (#308). Required so a caller that has no number says so.
+	 */
+	unreadCount: number | null;
 	/** The list body (filter sheet / sections / virtualized rows). */
 	children: ReactNode;
 	/**
@@ -442,9 +448,11 @@ export function MailListHeader({
 			),
 			titleMeta: (
 				<>
-					<span className="shrink-0 text-2xs text-fg-subtle">
-						{unreadCount.toLocaleString()} unread
-					</span>
+					{unreadCount === null ? null : (
+						<span className="shrink-0 text-2xs text-fg-subtle">
+							{unreadCount.toLocaleString()} unread
+						</span>
+					)}
 					<FilterToggle />
 					{refreshControl}
 				</>

package/src/components/mail/MailViewChrome.tsx

@@ -30,7 +30,8 @@ import { MailListHeader } from "./MailListHeader";
 
 interface MailViewChromeProps {
 	title: string;
-	unreadCount: number;
+	/** Unread count beside the title; `null` shows no number — see `MailListHeader`. */
+	unreadCount: number | null;
 	preset: FilterPreset;
 	selectedCategory: string;
 	activeFilters: ReadonlySet<string>;

package/src/components/mail/MailboxPane.tsx

@@ -30,6 +30,7 @@ import {
 	ReadingPaneEmpty,
 	RefreshButton,
 	type RescueCandidate,
+	type ResultCount,
 	type SearchResult,
 } from "@remit/ui";
 import { useInfiniteQuery } from "@tanstack/react-query";
@@ -87,6 +88,7 @@ import { useToggleReadFor } from "@/hooks/useMarkAsRead";
 import { useMoveMessages } from "@/hooks/useMoveMessages";
 import { useRefreshControl } from "@/hooks/useRefreshControl";
 import { useRescueCandidates } from "@/hooks/useRescueCandidates";
+import { useResultCount } from "@/hooks/useResultCount";
 import { useSearchTokenContext } from "@/hooks/useSearchTokenContext";
 import { useSemanticSearch } from "@/hooks/useSemanticSearch";
 import { useThreadActions } from "@/hooks/useThreadActions";
@@ -98,6 +100,7 @@ import { useUpdateAddressFlags } from "@/hooks/useUpdateAddressFlags";
 import type { ConversationTarget } from "@/lib/conversation-target";
 import { dedupeThreadMessages } from "@/lib/dedupe-thread-messages";
 import {
+	categoryLabel,
 	filterReach,
 	hasInboxFilter,
 	type InboxFilterCriteria,
@@ -110,6 +113,7 @@ import { useMailContext } from "@/lib/mail-context";
 import { useMailFreshness } from "@/lib/mail-freshness";
 import { isRescueCandidate } from "@/lib/rescue-candidates";
 import { recordRescueSentToJunk } from "@/lib/rescue-telemetry";
+import { shouldRequestResultCount } from "@/lib/result-count";
 import { normalizeSearchQuery } from "@/lib/search-query";
 import {
 	relatedSearchResults,
@@ -156,7 +160,8 @@ interface MailboxPaneContextValue {
 	mailboxAccountId: string | undefined;
 	mailboxAccountLoading: boolean;
 	mailboxName: string | null;
-	unreadCount: number;
+	/** The mailbox's unseen total, or null until it resolves — never a page length. */
+	unreadCount: number | null;
 	isDraftsMailbox: boolean;
 	// Rescue-from-Spam: true on the account's Junk/Spam folder, with the
 	// suspected-safe messages `useRescueCandidates` fetched. Drives the rescue
@@ -202,6 +207,8 @@ interface MailboxPaneContextValue {
 	 * header, not enough to reproduce the query server-side.
 	 */
 	searchPredicate: EscalationSearchQuery | undefined;
+	/** The server's count of the whole match set, for the result header. */
+	resultCount: ResultCount;
 	// List actions
 	onDeleteMessages: (ids: string[]) => void;
 	onMoveMessages: (ids: string[], dest: string) => void;
@@ -240,14 +247,6 @@ interface MailboxPaneContextValue {
  *  filtered path pages like the unfiltered one. */
 const THREADS_PAGE_SIZE = 50;
 
-/** Chip id → the label the empty state names the filter by. `all` is absent:
- *  it is how the category is cleared, not a category. */
-const CATEGORY_LABELS = new Map(
-	inboxFilterConfig()
-		.categories.filter((category) => category.id !== "all")
-		.map((category) => [category.id, category.label]),
-);
-
 const MailboxPaneCtx = createContext<MailboxPaneContextValue | null>(null);
 
 function useMailboxPane(): MailboxPaneContextValue {
@@ -322,15 +321,21 @@ function MailboxPaneProvider({
 		searchTokens,
 		filterParams,
 	);
-	const searchThreadsQuery = {
+	// What the list is asking about, with nothing about paging in it. The count
+	// is a property of the criteria alone, so it keys on this and a page fetch
+	// can never trigger one.
+	const searchCriteria = {
 		order: "desc" as const,
-		// Explicit: an unspecified limit clamps to THREAD_SEARCH_MAX_LIMIT (500),
-		// so switching paths without it multiplies the page size by ten.
-		limit: THREADS_PAGE_SIZE,
 		...(freeText ? { query: freeText } : {}),
 		...tokenParams,
 		...filterParams,
 	};
+	const searchThreadsQuery = {
+		...searchCriteria,
+		// Explicit: an unspecified limit clamps to THREAD_SEARCH_MAX_LIMIT (500),
+		// so switching paths without it multiplies the page size by ten.
+		limit: THREADS_PAGE_SIZE,
+	};
 	// What the request actually narrows by, whoever set it. `placeholderData`
 	// keeps the previous rows only under the same predicate, and a token
 	// narrowing the list is as much that predicate as a chip is.
@@ -393,6 +398,16 @@ function MailboxPaneProvider({
 				: undefined,
 	});
 
+	const resultCount = useResultCount({
+		mailboxId,
+		criteria: searchCriteria,
+		enabled: shouldRequestResultCount({
+			hasSearchQuery,
+			freeText,
+			residualTokenCount: residualTokens.length,
+		}),
+	});
+
 	const { accountId: mailboxAccountId, isLoading: mailboxAccountLoading } =
 		useMailboxAccount(mailboxId);
 	const mailboxName = useCurrentMailboxName({ accounts });
@@ -433,7 +448,7 @@ function MailboxPaneProvider({
 	// The empty state has to say how much was read, and the reach comes off the
 	// request rather than the call site: the day a chip is answered over a window
 	// instead of the whole mailbox, the sentence changes with it.
-	const filterLabel = CATEGORY_LABELS.get(filterCategory);
+	const filterLabel = categoryLabel(filterCategory);
 	const listFilter: MessageListFilter | undefined = filterLabel
 		? {
 				label: filterLabel,
@@ -512,7 +527,7 @@ function MailboxPaneProvider({
 	// The mailbox's own unseen total. A count over the loaded pages undercounts
 	// every mailbox larger than one page and creeps upward as the user scrolls,
 	// so there is no fallback: until the mailbox resolves there is no number.
-	const unreadCount = useCurrentMailboxUnseenCount({ accounts }) ?? 0;
+	const unreadCount = useCurrentMailboxUnseenCount({ accounts }) ?? null;
 
 	const toolbarActions = useThreadActions({
 		thread: selectedThread,
@@ -796,6 +811,7 @@ function MailboxPaneProvider({
 			hasSearchQuery && residualTokens.length === 0
 				? searchThreadsQuery
 				: undefined,
+		resultCount,
 		onDeleteMessages: handleDeleteMessages,
 		onMoveMessages: handleMoveMessages,
 		isDeleting,
@@ -860,6 +876,7 @@ function MailboxList() {
 		onClearFilters,
 		listFilter,
 		searchPredicate,
+		resultCount,
 	} = useMailboxPane();
 	const { searchQuery, searchInput, accounts, resultFolderIndex } =
 		useMailContext();
@@ -984,6 +1001,7 @@ function MailboxList() {
 			onRetry={onRetry}
 			searchQuery={searchQuery}
 			searchPredicate={searchPredicate}
+			resultCount={resultCount}
 			onDeleteMessages={onDeleteMessages}
 			isDeleting={isDeleting}
 			isMoving={isMoving}

package/src/components/mail/MessageList.tsx

@@ -4,10 +4,12 @@ import {
 	cn,
 	type Density,
 	deriveIsMultiSelectMode,
+	ListResultHeader,
 	type MessageListFilter,
 	MessageListLoadingMore,
 	MessageListPane,
 	nextFocusId,
+	type ResultCount,
 	type SelectionModifiers,
 	SelectionTopBar,
 	useSelection,
@@ -15,7 +17,6 @@ import {
 } from "@remit/ui";
 import { useBlocker } from "@tanstack/react-router";
 import { useVirtualizer } from "@tanstack/react-virtual";
-import { Search } from "lucide-react";
 import type { RefObject } from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useErrorBanners } from "@/components/ui/ErrorBannerProvider";
@@ -113,6 +114,12 @@ interface MessageListProps {
 	 * only the display string.
 	 */
 	searchPredicate?: EscalationSearchQuery;
+	/**
+	 * How many messages the search matches, as the server counted them — the
+	 * whole match set, not the pages loaded. Omitted where the count was never
+	 * asked for, which renders the header without a number.
+	 */
+	resultCount?: ResultCount;
 	onDeleteMessages?: (messageIds: string[]) => void;
 	isDeleting?: boolean;
 	isMoving?: boolean;
@@ -188,21 +195,6 @@ const readStoredDensity = (): Density => {
 	return "comfortable";
 };
 
-/**
- * Names what the list is showing. No number: the only figure available here is
- * the length of the loaded pages, and a page length presented as a result total
- * contradicts the completeness the filtered empty state states in the same view
- * (#306). The exact count is #307's.
- */
-const SearchResultsHeader = ({ query }: { query: string }) => (
-	<div className="flex items-center gap-2 px-3 py-2 border-b border-line bg-surface-sunken/30">
-		<Search className="size-4 text-fg-muted" />
-		<span className="text-sm text-fg-muted">
-			Results for &ldquo;{query}&rdquo;
-		</span>
-	</div>
-);
-
 /**
  * Why Move is withheld from a selection, in the toolbar's own words. Rows from
  * a per-mailbox endpoint carry no account of their own, so the list's own
@@ -230,6 +222,7 @@ export const MessageList = ({
 	onRetry,
 	searchQuery,
 	searchPredicate,
+	resultCount = { kind: "unknown" },
 	onDeleteMessages,
 	isDeleting = false,
 	isMoving = false,
@@ -1227,7 +1220,7 @@ export const MessageList = ({
 	const virtualBody = (
 		<>
 			{isSearching && searchQuery && (
-				<SearchResultsHeader query={searchQuery} />
+				<ListResultHeader query={searchQuery} count={resultCount} />
 			)}
 			<div
 				ref={parentRef}

package/src/hooks/useResultCount.render.test.ts

@@ -0,0 +1,161 @@
+/**
+ * The result count is one question asked of the server, not a walk of the
+ * pages (#307).
+ *
+ * The header used to render `threads.length`, which understated every search
+ * matching more than one page and climbed as the reader scrolled. These mount
+ * the real hook against the real fetch seam and read what actually left: the
+ * whole match set from one request, no second request when the list pages, and
+ * nothing at all for a query still being typed.
+ */
+
+import assert from "node:assert/strict";
+import { afterEach, describe, it } from "node:test";
+import type { ResultCount } from "@remit/ui";
+import { createElement } from "react";
+import { createDomHarness, type DomHarness } from "../test-support/dom";
+import { type HttpMock, mockFetch } from "../test-support/http";
+import { type ThreadSearchCriteria, useResultCount } from "./useResultCount.js";
+
+const INBOX = "mbx-inbox";
+/** Far more than a page holds — the number the header must not derive itself. */
+const TOTAL_MATCHES = 1284;
+
+let harness: DomHarness | undefined;
+let http: HttpMock | undefined;
+
+afterEach(() => {
+	harness?.close();
+	harness = undefined;
+	http?.restore();
+	http = undefined;
+});
+
+/** Count-only requests, in order — the ones that asked for a number. */
+const countRequests = () =>
+	(http?.to("/threads/search") ?? []).filter(
+		(call) =>
+			new URL(call.url, "http://localhost").searchParams.get("count") ===
+			"true",
+	);
+
+interface Probe {
+	count: () => ResultCount;
+	/**
+	 * Render again on the same client, so a second search reaches the cache the
+	 * first one filled — which is the only place a stale count can come from.
+	 */
+	rerender: (next?: {
+		criteria?: ThreadSearchCriteria;
+		enabled?: boolean;
+	}) => Promise<void>;
+}
+
+const mount = async (
+	criteria: ThreadSearchCriteria,
+	enabled: boolean,
+	answer: unknown = { items: [], count: TOTAL_MATCHES },
+): Promise<Probe> => {
+	http = mockFetch((call) =>
+		call.path.endsWith("/threads/search") ? answer : { items: [] },
+	);
+
+	let value: ResultCount | undefined;
+	const CountProbe = ({
+		search,
+		on,
+	}: {
+		search: ThreadSearchCriteria;
+		on: boolean;
+	}) => {
+		value = useResultCount({ mailboxId: INBOX, criteria: search, enabled: on });
+		return null;
+	};
+
+	const mounted = createDomHarness();
+	harness = mounted;
+	let search = criteria;
+	let on = enabled;
+	const render: Probe["rerender"] = async (next) => {
+		if (next?.criteria) search = next.criteria;
+		if (next?.enabled !== undefined) on = next.enabled;
+		mounted.renderApp(createElement(CountProbe, { search, on }));
+		await mounted.flush();
+		await mounted.wait(20);
+		await mounted.flush();
+	};
+	await render();
+	return {
+		count: () => {
+			if (!value) throw new Error("hook did not render");
+			return value;
+		},
+		rerender: render,
+	};
+};
+
+describe("useResultCount (#307)", () => {
+	it("answers with the whole match set the server counted", async () => {
+		const probe = await mount({ query: "invoice" }, true);
+
+		assert.deepEqual(probe.count(), { kind: "exact", value: TOTAL_MATCHES });
+		assert.equal(countRequests().length, 1);
+	});
+
+	it("asks with no cursor, so paging the list never re-counts", async () => {
+		const probe = await mount({ query: "invoice" }, true);
+		await probe.rerender();
+		await probe.rerender();
+
+		assert.equal(
+			countRequests().length,
+			1,
+			"the count was asked again for a predicate that did not change",
+		);
+		const asked = new URL(countRequests()[0]?.url ?? "", "http://localhost")
+			.searchParams;
+		assert.equal(asked.get("continuationToken"), null);
+		assert.equal(asked.get("results"), "false");
+	});
+
+	it("issues no request at all while it is disabled", async () => {
+		const probe = await mount({ query: "in" }, false);
+
+		assert.equal(countRequests().length, 0);
+		assert.deepEqual(
+			probe.count(),
+			{ kind: "unknown" },
+			"an uncounted search reported a number",
+		);
+	});
+
+	/**
+	 * `enabled` gates the request, not the cache. Two searches reach the same key
+	 * whenever what separates them never reaches the request — `invoice` and
+	 * `invoice before:2020` send identical criteria — so the second must not read
+	 * the first one's answer back out of the cache.
+	 */
+	it("forgets the number the moment it stops being asked for", async () => {
+		const probe = await mount({ query: "invoice" }, true);
+		assert.deepEqual(probe.count(), { kind: "exact", value: TOTAL_MATCHES });
+
+		await probe.rerender({ enabled: false });
+
+		assert.deepEqual(
+			probe.count(),
+			{ kind: "unknown" },
+			"a count nobody asked for was served from the cache",
+		);
+		assert.equal(countRequests().length, 1, "the gate stopped gating requests");
+	});
+
+	it("reports no number when the server withholds the count", async () => {
+		const probe = await mount({ query: "invoice" }, true, { items: [] });
+
+		assert.deepEqual(
+			probe.count(),
+			{ kind: "unknown" },
+			"an absent count became a zero",
+		);
+	});
+});

package/src/hooks/useResultCount.ts

@@ -0,0 +1,68 @@
+import { threadOperationsSearchThreadsQueryKey } from "@remit/api-http-client/@tanstack/react-query.gen.ts";
+import { threadOperationsSearchThreads } from "@remit/api-http-client/sdk.gen.ts";
+import type { ThreadOperationsSearchThreadsData } from "@remit/api-http-client/types.gen.ts";
+import type { ResultCount } from "@remit/ui";
+import { useQuery } from "@tanstack/react-query";
+import { toResultCount } from "@/lib/result-count";
+
+/**
+ * What the list is asking about, with nothing about paging in it. The count is
+ * a property of the criteria alone, so a page fetch can never trigger one.
+ */
+export type ThreadSearchCriteria = Omit<
+	NonNullable<ThreadOperationsSearchThreadsData["query"]>,
+	"continuationToken" | "limit" | "count" | "results"
+>;
+
+export interface UseResultCountOptions {
+	mailboxId: string;
+	criteria: ThreadSearchCriteria;
+	/**
+	 * Whether this search is worth counting at all — see
+	 * `shouldRequestResultCount`. Disabled, the surface renders no number rather
+	 * than a stale one from the search before it.
+	 */
+	enabled: boolean;
+}
+
+/** A minute: long enough that returning to a search just left costs nothing. */
+const COUNT_STALE_TIME_MS = 60_000;
+
+/**
+ * How many messages the search matches, from the server that resolves it —
+ * one request against the criteria, never a walk of the pages (#307).
+ *
+ * Its own query, keyed on the criteria without the cursor, so the list pages
+ * without re-counting. An answer that carries no count — off-row criteria, per
+ * #305 — stays absent rather than becoming a zero.
+ */
+export const useResultCount = ({
+	mailboxId,
+	criteria,
+	enabled,
+}: UseResultCountOptions): ResultCount => {
+	const query = { ...criteria, count: true, results: false };
+	const { data } = useQuery({
+		queryKey: threadOperationsSearchThreadsQueryKey({
+			path: { mailboxId },
+			query,
+		}),
+		queryFn: async () => {
+			const { data: response } = await threadOperationsSearchThreads({
+				path: { mailboxId },
+				query,
+				throwOnError: true,
+			});
+			return response;
+		},
+		enabled,
+		staleTime: COUNT_STALE_TIME_MS,
+	});
+	// `enabled` gates the request, not the cache: a criteria set that asks for no
+	// count still reads whatever the last identical key left behind. Two searches
+	// share a key whenever the terms that separate them reach the request as
+	// nothing — `before:`/`after:`/`account:` are stripped from the free text and
+	// carry no param — so a disabled count that read `data` would render the
+	// previous search's total over this one's rows.
+	return enabled ? toResultCount(data?.count) : { kind: "unknown" };
+};

package/src/hooks/useStarredThreads.test.ts

@@ -22,6 +22,7 @@ import { renderToString } from "react-dom/server";
 import {
 	starredThreadsQueryKey,
 	useStarredThreads,
+	useStarredUnreadCount,
 } from "./useStarredThreads.js";
 
 interface Page {
@@ -141,3 +142,78 @@ describe("useStarredThreads", () => {
 		assert.deepEqual(threads, []);
 	});
 });
+
+// #308: the chips were a pass over the pages loaded so far, and the header
+// count was their length. Both are the server's answer now.
+describe("starred criteria", () => {
+	test("carries the chips as query parameters", () => {
+		const [params] = starredThreadsQueryKey({
+			category: ["social"],
+			unread: true,
+			attachments: true,
+		}) as [
+			{
+				query?: {
+					starred?: boolean;
+					category?: string[];
+					unread?: boolean;
+					attachments?: boolean;
+				};
+			},
+		];
+		assert.equal(params.query?.starred, true);
+		assert.deepEqual(params.query?.category, ["social"]);
+		assert.equal(params.query?.unread, true);
+		assert.equal(params.query?.attachments, true);
+	});
+
+	test("an unfiltered listing asks for exactly what it asked for before", () => {
+		assert.deepEqual(starredThreadsQueryKey({}), starredThreadsQueryKey());
+	});
+});
+
+describe("useStarredUnreadCount", () => {
+	function renderCount(seed?: { count?: number }): number | undefined {
+		const client = new QueryClient({
+			defaultOptions: { queries: { retry: false } },
+		});
+		if (seed) {
+			client.setQueryData(
+				unifiedThreadOperationsListAllThreadsQueryKey({
+					query: {
+						starred: true,
+						order: "desc",
+						unread: true,
+						count: true,
+						results: false,
+					},
+				}),
+				seed,
+			);
+		}
+
+		let captured: number | undefined;
+		function Capture() {
+			captured = useStarredUnreadCount();
+			return null;
+		}
+		renderToString(
+			createElement(
+				QueryClientProvider,
+				{ client },
+				createElement(Capture),
+			) as never,
+		);
+		return captured;
+	}
+
+	test("reports the server's count", () => {
+		assert.equal(renderCount({ count: 137 }), 137);
+	});
+
+	// A count the server has not answered is no number at all. A page length
+	// dressed as a total is what this replaces.
+	test("reports nothing when the server has not answered", () => {
+		assert.equal(renderCount(), undefined);
+	});
+});

package/src/hooks/useStarredThreads.ts

@@ -8,20 +8,43 @@
  * selection from any other listing reintroduces issue #70 — the INBOX-scoped
  * unified listing cannot see a starred thread filed elsewhere, so its row is
  * clickable but resolves to nothing and no reading pane opens.
+ *
+ * The filters travel as query parameters rather than as a pass over the pages
+ * loaded so far. A starred collection is paged, so a category whose mail sits
+ * below the newest page rendered an empty list however much of it the
+ * collection held (#308); the server answers the predicate over the whole
+ * collection instead, and a page comes back full of matches.
  */
 import { unifiedThreadOperationsListAllThreadsQueryKey } from "@remit/api-http-client/@tanstack/react-query.gen.ts";
 import { unifiedThreadOperationsListAllThreads } from "@remit/api-http-client/sdk.gen.ts";
 import type { RemitImapThreadMessageResponse } from "@remit/api-http-client/types.gen.ts";
-import { useInfiniteQuery } from "@tanstack/react-query";
+import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
 import { useMemo } from "react";
+import type { InboxFilterParams } from "@/lib/inbox-filters";
+
+/** The criteria the Flagged view narrows its listing by, all server-applied. */
+export interface StarredCriteria extends InboxFilterParams {
+	/** Free text, matched against subject and From over the whole collection. */
+	query?: string;
+	/** Page size, set only by the single-page text search. */
+	limit?: number;
+}
+
+// `starred` and `order` are the view itself, not a criterion, so they are set
+// last: no chip can widen the listing past starred mail or reorder it.
+const starredQuery = (criteria: StarredCriteria) => ({
+	...criteria,
+	starred: true as const,
+	order: "desc" as const,
+});
 
-export const starredThreadsQueryKey = () =>
+export const starredThreadsQueryKey = (criteria: StarredCriteria = {}) =>
 	unifiedThreadOperationsListAllThreadsQueryKey({
-		query: { starred: true, order: "desc" },
+		query: starredQuery(criteria),
 	});
 
 interface StarredThreads {
-	/** Every starred thread across the pages loaded so far, newest first. */
+	/** Every matching starred thread across the pages loaded so far, newest first. */
 	threads: RemitImapThreadMessageResponse[];
 	isLoading: boolean;
 	isError: boolean;
@@ -32,7 +55,9 @@ interface StarredThreads {
 	isFetchingNextPage: boolean;
 }
 
-export function useStarredThreads(): StarredThreads {
+export function useStarredThreads(
+	criteria: StarredCriteria = {},
+): StarredThreads {
 	const {
 		data,
 		isLoading,
@@ -43,12 +68,11 @@ export function useStarredThreads(): StarredThreads {
 		hasNextPage,
 		isFetchingNextPage,
 	} = useInfiniteQuery({
-		queryKey: starredThreadsQueryKey(),
+		queryKey: starredThreadsQueryKey(criteria),
 		queryFn: async ({ pageParam }) => {
 			const { data: page } = await unifiedThreadOperationsListAllThreads({
 				query: {
-					starred: true,
-					order: "desc",
+					...starredQuery(criteria),
 					continuationToken: pageParam,
 				},
 				throwOnError: true,
@@ -76,3 +100,70 @@ export function useStarredThreads(): StarredThreads {
 		isFetchingNextPage,
 	};
 }
+
+/**
+ * The server's own text match over the whole starred collection, as one page.
+ *
+ * The free-text filter has two halves that no single request covers: the server
+ * matches subject and From over every starred message, and the client can also
+ * match a snippet, but only on rows it has already loaded. The server's set is
+ * the filter — it is the half that sees the mail below the newest page — and
+ * the snippet pass complements it (#308). Same shape as the daily brief's
+ * unscoped search, which merges the same two halves.
+ */
+export function useStarredTextSearch(
+	criteria: StarredCriteria,
+	limit: number,
+): RemitImapThreadMessageResponse[] {
+	const text = criteria.query ?? "";
+	const query = { ...starredQuery(criteria), limit };
+	const { data } = useQuery({
+		queryKey: unifiedThreadOperationsListAllThreadsQueryKey({ query }),
+		queryFn: async () => {
+			const { data: page } = await unifiedThreadOperationsListAllThreads({
+				query,
+				throwOnError: true,
+			});
+			return page;
+		},
+		enabled: text.length > 0,
+		staleTime: 30_000,
+	});
+	return useMemo(() => data?.items ?? [], [data]);
+}
+
+/**
+ * How many of the matching starred messages are unread, counted by the server.
+ *
+ * Its own request, so no cursor enters the key and pressing "load more" cannot
+ * move the number — the count is over the whole collection under the active
+ * criteria, which is what the header claims it is. A page-length count grows
+ * with every press and reads as a total, which is the defect this replaces
+ * (#308). `results: false` reads the count alone: no rows are fetched or
+ * enriched to answer it.
+ *
+ * Undefined until the server answers, and undefined when it cannot. The header
+ * shows no number rather than a made-up one.
+ */
+export function useStarredUnreadCount(
+	criteria: StarredCriteria = {},
+): number | undefined {
+	const query = {
+		...starredQuery(criteria),
+		unread: true,
+		count: true,
+		results: false,
+	};
+	const { data } = useQuery({
+		queryKey: unifiedThreadOperationsListAllThreadsQueryKey({ query }),
+		queryFn: async () => {
+			const { data: page } = await unifiedThreadOperationsListAllThreads({
+				query,
+				throwOnError: true,
+			});
+			return page;
+		},
+		staleTime: 60_000,
+	});
+	return data?.count;
+}

package/src/lib/flagged-criteria.test.ts

@@ -0,0 +1,99 @@
+/**
+ * What the Flagged view asks the server for.
+ *
+ * #308: the chips became query parameters, and the tokens that ask for the same
+ * thing have to travel the same way. A token evaluated over the pages loaded so
+ * far reintroduces the defect one control down — the field would show an empty
+ * list for a category whose starred mail sits below the newest page, while the
+ * chip beside it showed the mail.
+ */
+import assert from "node:assert/strict";
+import { describe, test } from "node:test";
+import { flaggedCriteria } from "./flagged-criteria.js";
+import type { InboxFilterCriteria } from "./inbox-filters.js";
+import { parseSearchTokens, type SearchToken } from "./search-tokens.js";
+
+const NO_CHIPS: InboxFilterCriteria = {
+	category: "all",
+	attributes: new Set<string>(),
+};
+
+const chips = (
+	category: string,
+	attributes: string[] = [],
+): InboxFilterCriteria => ({ category, attributes: new Set(attributes) });
+
+const tokensOf = (query: string): SearchToken[] =>
+	parseSearchTokens(query, {
+		accountsByName: new Map([["alice", "acc_1"]]),
+		mailboxesByName: new Map([["sent", "mb2"]]),
+	}).tokens;
+
+const criteriaOf = (query: string, filters = NO_CHIPS) =>
+	flaggedCriteria(filters, tokensOf(query)).criteria;
+
+const residualTypes = (query: string, filters = NO_CHIPS) =>
+	flaggedCriteria(filters, tokensOf(query)).residual.map((t) => t.type);
+
+describe("flaggedCriteria", () => {
+	test("a typed token asks for exactly what its chip asks for", () => {
+		assert.deepEqual(
+			criteriaOf("is:unread"),
+			criteriaOf("", chips("all", ["unread"])),
+		);
+		assert.deepEqual(
+			criteriaOf("has:attachment"),
+			criteriaOf("", chips("all", ["attachment"])),
+		);
+		assert.deepEqual(
+			criteriaOf("category:personal"),
+			criteriaOf("", chips("personal")),
+		);
+	});
+
+	test("carries the row criteria as parameters", () => {
+		assert.deepEqual(criteriaOf("is:unread"), { unread: true });
+		assert.deepEqual(criteriaOf("is:read"), { unread: false });
+		assert.deepEqual(criteriaOf("has:attachment"), { attachments: true });
+		assert.deepEqual(criteriaOf("category:social"), { category: ["social"] });
+	});
+
+	test("leaves nothing carried in the residue", () => {
+		assert.deepEqual(
+			residualTypes("is:unread has:attachment category:personal"),
+			[],
+		);
+	});
+
+	// The view is starred mail, so the request always carries `starred`. A token
+	// asking for what the request already asks for is answered, not re-applied.
+	test("answers is:starred from the view itself", () => {
+		assert.deepEqual(residualTypes("is:starred"), []);
+	});
+
+	// No `from`/`subject` parameter on this endpoint: its one text parameter
+	// matches both at once, so these stay a pass over the returned rows rather
+	// than being dropped from a request that never carried them.
+	test("keeps the tokens no parameter carries", () => {
+		assert.deepEqual(residualTypes("from:alice"), ["from"]);
+		assert.deepEqual(residualTypes("before:2026-01-01"), ["before"]);
+		assert.deepEqual(residualTypes("in:sent"), ["in"]);
+		assert.deepEqual(residualTypes("account:alice"), ["account"]);
+	});
+
+	test("the chip wins over a token that contradicts it", () => {
+		const { criteria, residual } = flaggedCriteria(
+			chips("all", ["unread"]),
+			tokensOf("is:read"),
+		);
+		assert.equal(criteria.unread, true);
+		assert.deepEqual(
+			residual.map((t) => t.type),
+			["isRead"],
+		);
+	});
+
+	test("a cleared category sets no category parameter", () => {
+		assert.deepEqual(criteriaOf("", NO_CHIPS), {});
+	});
+});

package/src/lib/flagged-criteria.ts

@@ -0,0 +1,61 @@
+/**
+ * What the Flagged view asks `listAllThreads` for, and what is left over.
+ *
+ * Every criterion the view offers — the category chip, the Unread and Has
+ * attachment chips, and the `category:` / `is:unread` / `is:read` /
+ * `has:attachment` / `is:starred` tokens typed in the field — is a column on
+ * the ThreadMessage row, so all of them travel as query parameters. A criterion
+ * applied over the pages loaded so far is the defect this replaces: a starred
+ * collection is paged, so anything below the newest page was invisible to it
+ * (#308).
+ *
+ * `starred` is the view rather than a criterion: the request always carries it,
+ * which is what makes `is:starred` a carried token instead of residue.
+ *
+ * A chip beats a token where both set the same parameter — a control on screen
+ * beats text in a field — and the overruled token drops to the residue, where
+ * it matches nothing, which is the honest answer to a contradiction.
+ */
+import type {
+	InboxFilterCriteria,
+	InboxFilterParams,
+} from "./inbox-filters.js";
+import { inboxFilterParams } from "./inbox-filters.js";
+import type { SearchToken } from "./search-tokens.js";
+import {
+	type ThreadSearchTokenParamName,
+	threadSearchTokens,
+} from "./thread-search-tokens.js";
+
+/**
+ * The token parameters `listAllThreads` carries. It has no `from` or `subject`
+ * of its own — its one text parameter matches both at once — so those two
+ * tokens stay residue rather than being dropped from a request that never had
+ * them.
+ */
+export const FLAGGED_TOKEN_PARAMS: readonly ThreadSearchTokenParamName[] = [
+	"category",
+	"unread",
+	"starred",
+	"attachments",
+];
+
+export interface FlaggedCriteria {
+	/** What the request narrows by, chips and carried tokens together. */
+	criteria: InboxFilterParams;
+	/** The tokens no parameter carries; apply these over the returned rows. */
+	residual: SearchToken[];
+}
+
+export const flaggedCriteria = (
+	chips: InboxFilterCriteria,
+	tokens: readonly SearchToken[],
+): FlaggedCriteria => {
+	const chipParams = inboxFilterParams(chips);
+	const { params, residual } = threadSearchTokens(
+		tokens,
+		{ ...chipParams, starred: true },
+		FLAGGED_TOKEN_PARAMS,
+	);
+	return { criteria: { ...params, ...chipParams }, residual };
+};

package/src/lib/inbox-filters.ts

@@ -3,20 +3,26 @@ import type {
 	ThreadOperationsSearchThreadsData,
 } from "@remit/api-http-client/types.gen.ts";
 import { MessageCategory } from "@remit/domain-enums";
-import type { FilterReach } from "@remit/ui";
+import { type FilterReach, inboxFilterConfig } from "@remit/ui";
 
 /** The request `threadOperationsSearchThreads` takes, whole. */
 export type ThreadSearchQuery = NonNullable<
 	ThreadOperationsSearchThreadsData["query"]
 >;
 
-/** The parameters the inbox chips set on that request. */
+/**
+ * The parameters the filter chips set on a thread listing.
+ *
+ * Named for the inbox, which had them first, but shared: `listAllThreads` takes
+ * the same four (#308), so the Flagged view sends the chips through this rather
+ * than growing a second translation of the same chip ids.
+ */
 export type InboxFilterParams = Pick<
 	ThreadSearchQuery,
 	"category" | "unread" | "starred" | "attachments"
 >;
 
-/** The chip state the inbox holds: one category, any number of attributes. */
+/** The chip state a filtered list holds: one category, any number of attributes. */
 export interface InboxFilterCriteria {
 	/** A category id, or `"all"` when the category is cleared. */
 	category: string;
@@ -121,3 +127,18 @@ export const sameInboxFilter = (
 	if (!previous) return false;
 	return filterIdentity(previous) === filterIdentity(params);
 };
+
+/**
+ * The label the empty state names an active category filter by, or undefined
+ * when the id names no category — `"all"` is how the category is cleared, not a
+ * category. Read off the preset so the chip and the sentence about it can never
+ * disagree; every list preset draws its categories from the same set.
+ */
+const CATEGORY_LABELS = new Map(
+	inboxFilterConfig()
+		.categories.filter((category) => category.id !== "all")
+		.map((category) => [category.id, category.label]),
+);
+
+export const categoryLabel = (id: string): string | undefined =>
+	CATEGORY_LABELS.get(id);

package/src/lib/result-count.test.ts

@@ -0,0 +1,97 @@
+/**
+ * The exact match count is opt-in because it is a second read over the whole
+ * match set (#307). These pin who pays for it and what happens when the server
+ * declines to answer.
+ */
+
+import assert from "node:assert/strict";
+import { describe, test } from "node:test";
+import type { EscalationSearchQuery } from "@/hooks/useEscalatedActions";
+import {
+	type ResultCountRequestInput,
+	shouldRequestResultCount,
+	toResultCount,
+} from "./result-count.js";
+
+const request = (input: Partial<ResultCountRequestInput>): boolean =>
+	shouldRequestResultCount({
+		hasSearchQuery: true,
+		freeText: "",
+		residualTokenCount: 0,
+		...input,
+	});
+
+describe("shouldRequestResultCount", () => {
+	test("browsing a mailbox asks for no count", () => {
+		assert.equal(request({ hasSearchQuery: false }), false);
+	});
+
+	test("a free-text query is not counted while it is being typed", () => {
+		for (const freeText of ["k", "ku", " ku "]) {
+			assert.equal(
+				request({ freeText }),
+				false,
+				`"${freeText}" was counted per keystroke`,
+			);
+		}
+	});
+
+	test("a free-text query long enough for the index is counted", () => {
+		assert.equal(request({ freeText: "kub" }), true);
+	});
+
+	test("a query made only of filter tokens is counted straight away", () => {
+		assert.equal(request({}), true);
+	});
+
+	/**
+	 * `before:`/`after:`/`account:` reach the request as nothing, so the server
+	 * would count a wider set than the list shows — and `invoice before:2020`
+	 * sends criteria identical to `invoice`, which is also the previous search's
+	 * cache key.
+	 */
+	test("a term the request could not carry stops the count", () => {
+		assert.equal(
+			request({ freeText: "invoice", residualTokenCount: 1 }),
+			false,
+			"the count covered rows the list filters back out",
+		);
+		assert.equal(
+			request({ freeText: "invoice", residualTokenCount: 0 }),
+			true,
+			"the same search without the residual term must still be counted",
+		);
+	});
+});
+
+describe("toResultCount", () => {
+	test("the server's number is the whole match set", () => {
+		assert.deepEqual(toResultCount(1284), { kind: "exact", value: 1284 });
+	});
+
+	test("zero matches is a number, not an absent count", () => {
+		assert.deepEqual(toResultCount(0), { kind: "exact", value: 0 });
+	});
+
+	test("an absent count stays absent rather than becoming zero", () => {
+		assert.deepEqual(toResultCount(undefined), { kind: "unknown" });
+	});
+});
+
+/**
+ * `searchThreads` withholds the count when the criteria carry an off-row term
+ * (#305), and the escalated selection reads `count` as a required number to size
+ * its run. Neither term can reach that predicate today; this fails the day one
+ * is added, so the absent-count state gets designed rather than surfacing as a
+ * run that refuses to start.
+ */
+describe("the escalation predicate carries no off-row criterion", () => {
+	test("senderTrust and dkimMismatch are not part of it", () => {
+		type OffRow = Extract<
+			keyof EscalationSearchQuery,
+			"senderTrust" | "dkimMismatch"
+		>;
+		const offRow: [OffRow] extends [never] ? true : false = true;
+		assert.equal(offRow, true);
+	});
+});

package/src/lib/result-count.ts

@@ -0,0 +1,57 @@
+import type { ResultCount } from "@remit/ui";
+
+/**
+ * Shortest free text a count is asked for. `npm-scripts/sqlite-search-index.sql`
+ * documents that a query under three characters falls out of the trigram index
+ * onto a folded `LIKE` scan, so counting one is a mailbox scan per typed
+ * character. The list itself still pages — only the count waits.
+ */
+export const MIN_COUNTED_QUERY_LENGTH = 3;
+
+export interface ResultCountRequestInput {
+	/** True while the list is answering a search rather than plain browsing. */
+	hasSearchQuery: boolean;
+	/** The literal text of the search, with its filter tokens already taken out. */
+	freeText: string;
+	/**
+	 * Tokens the request could not carry — `before:`, `after:`, `account:`, and
+	 * any second value for a parameter that takes one — applied over the rows
+	 * after they arrive.
+	 */
+	residualTokenCount: number;
+}
+
+/**
+ * Whether the exact match count is worth one request against these criteria.
+ *
+ * Chip- and token-driven criteria are counted straight away: they change once
+ * per click, and the predicate is one the index answers. Free text is counted
+ * only once it is long enough to be indexed, which is what keeps a per-character
+ * query from paying for a count it will throw away on the next keystroke.
+ *
+ * A residual token stops the count outright. The server never saw that term, so
+ * it would count a wider set than the list shows — and two searches differing
+ * only by one reach the request as the same criteria, so the answer would also
+ * be the one the previous search left in the cache.
+ */
+export const shouldRequestResultCount = ({
+	hasSearchQuery,
+	freeText,
+	residualTokenCount,
+}: ResultCountRequestInput): boolean => {
+	if (!hasSearchQuery) return false;
+	if (residualTokenCount > 0) return false;
+	const typed = freeText.trim();
+	return typed.length === 0 || typed.length >= MIN_COUNTED_QUERY_LENGTH;
+};
+
+/**
+ * The server's answer, or no number.
+ *
+ * The only input is `ThreadSearchResponse.count`, which is the whole match set
+ * or absent (#305) — never a page length. Absent stays absent: a count the
+ * server declined to compute is not zero, and the surface renders nothing
+ * rather than a figure it made up.
+ */
+export const toResultCount = (count: number | undefined): ResultCount =>
+	count === undefined ? { kind: "unknown" } : { kind: "exact", value: count };

package/src/lib/starred-rows.ts

@@ -1,5 +1,3 @@
-import type { RemitImapThreadMessageResponse } from "@remit/api-http-client/types.gen.ts";
-
 /**
  * Collapse rows that are the same conversation.
  *
@@ -12,12 +10,19 @@ import type { RemitImapThreadMessageResponse } from "@remit/api-http-client/type
  * conversation single even when its copies straddle a page boundary — a single
  * page cannot know what earlier pages already showed. The first row wins, which
  * is the newest under the server's descending order.
+ *
+ * Generic over anything naming its thread, so the same collapse runs over the
+ * API rows and over the merged display rows a text search produces — two
+ * definitions of "same conversation" is one too many. A row that names no
+ * thread is never merged: there is nothing to say it is the same conversation
+ * as any other.
  */
-export const dedupeByThread = (
-	items: RemitImapThreadMessageResponse[],
-): RemitImapThreadMessageResponse[] => {
+export const dedupeByThread = <T extends { threadId?: string }>(
+	items: T[],
+): T[] => {
 	const seen = new Set<string>();
 	return items.filter((item) => {
+		if (item.threadId === undefined) return true;
 		if (seen.has(item.threadId)) return false;
 		seen.add(item.threadId);
 		return true;

package/src/lib/thread-search-tokens.ts

@@ -33,6 +33,19 @@ export type ThreadSearchTokenParams = Pick<
 	"from" | "subject" | "category" | "unread" | "starred" | "attachments"
 >;
 
+/** A parameter name a listing endpoint accepts. */
+export type ThreadSearchTokenParamName = keyof ThreadSearchTokenParams;
+
+/**
+ * Every parameter `searchThreads` takes, the default set.
+ *
+ * `listAllThreads` takes all of these except `from` and `subject`, so a caller
+ * on that endpoint names its own set and the two tokens come back as residue
+ * rather than being silently dropped from a request that never carried them.
+ */
+export const THREAD_SEARCH_TOKEN_PARAMS: readonly ThreadSearchTokenParamName[] =
+	["from", "subject", "category", "unread", "starred", "attachments"];
+
 export interface ThreadSearchTokens {
 	/** What the tokens add to the request. */
 	params: ThreadSearchTokenParams;
@@ -106,17 +119,32 @@ const isCarried = (
 	}
 };
 
+const narrowTo = (
+	params: ThreadSearchTokenParams,
+	carries: readonly ThreadSearchTokenParamName[],
+): ThreadSearchTokenParams =>
+	Object.fromEntries(
+		Object.entries(params).filter(([name]) =>
+			carries.includes(name as ThreadSearchTokenParamName),
+		),
+	);
+
 /**
- * Split the tokens into the parameters the thread search takes and the residue
+ * Split the tokens into the parameters the thread listing takes and the residue
  * the caller has to apply itself. `chipParams` are the parameters already set
- * by the inbox filter chips, which win where they overlap.
+ * by the filter chips, which win where they overlap; `carries` names the
+ * parameters the endpoint being called actually accepts.
  */
 export function threadSearchTokens(
 	tokens: readonly SearchToken[],
 	chipParams: InboxFilterParams = {},
+	carries: readonly ThreadSearchTokenParamName[] = THREAD_SEARCH_TOKEN_PARAMS,
 ): ThreadSearchTokens {
-	const params = paramsFromTokens(tokens);
-	const request: ThreadSearchTokenParams = { ...params, ...chipParams };
+	const params = narrowTo(paramsFromTokens(tokens), carries);
+	const request: ThreadSearchTokenParams = {
+		...params,
+		...narrowTo(chipParams, carries),
+	};
 	return {
 		params,
 		residual: tokens.filter((token) => !isCarried(request, token)),