Multi-Agent Collaboration for Team and Friends
TypeScript agent-automationagent-orchestrationagent-workflowai-agentsai-collaborationai-memoryai-workforceautonomous-agentsclaude-codeclaude-code-skillscodexcoding-agentmulti-agentmultiple-agentone-person-businessone-person-companyone-person-teamopencodesolopreneur
fix(web): stabilize channel sidebar first render (#1059)
Generb6072cc1d1d7
diff --git a/src/web/src/app/c/QueryProvider.tsx b/src/web/src/app/c/QueryProvider.tsxindex f3d09f9af..7035650c1 100644--- a/src/web/src/app/c/QueryProvider.tsx+++ b/src/web/src/app/c/QueryProvider.tsx@@ -12,7 +12,7 @@ import {type CommunityRestoredCollections,PERSIST_BUSTER,PERSIST_MAX_AGE_MS,- shouldPersistQuery,+ shouldDehydrateCommunityQuery,} from "@/lib/query-persister"import { disposeAccountReadStateReconciliation } from "@/hooks/community/community-ws/read-state-reconciliation"import { disposeReadCoordinator } from "@/hooks/community/read-coordinator"@@ -233,10 +233,7 @@ function ScopedQueryProvider({maxAge: PERSIST_MAX_AGE_MS,buster: PERSIST_BUSTER,dehydrateOptions: {- shouldDehydrateQuery: (query) => {- if (query.state.status !== "success") return false- return shouldPersistQuery(query.queryKey, query.state.data)- },+ shouldDehydrateQuery: shouldDehydrateCommunityQuery,},}}>diff --git a/src/web/src/app/c/channels/layout.route-memory.dom.test.ts b/src/web/src/app/c/channels/layout.route-memory.dom.test.tsindex a3e0f6955..079786cb8 100644--- a/src/web/src/app/c/channels/layout.route-memory.dom.test.ts+++ b/src/web/src/app/c/channels/layout.route-memory.dom.test.ts@@ -184,7 +184,7 @@ vi.mock("@/lib/community/last-channel", () => ({vi.mock("@/hooks/community/use-server-panels", () => ({ usePresence: vi.fn() }))vi.mock("@/hooks/community/use-forum-sidebar-threads", () => ({resolveForumSidebarRouteCandidate: () => null,- useForumSidebarThreads: () => ({ threads: [], parentUnread: {} }),+ useForumSidebarThreads: () => ({ threads: [], parentUnread: {}, projectionReady: true, sidebar: { server: mocks.serverSnapshot.current, status: "ready" } }),}))vi.mock("@/stores/community/ws", async (importOriginal) => ({ ...await importOriginal<typeof import("@/stores/community/ws")>(),useCommunityWsStore: (selector: (state: {diff --git a/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.ts b/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.tsindex 8d37f153b..83fb0522b 100644--- a/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.ts+++ b/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.ts@@ -6,6 +6,7 @@ import { act, fireEvent, screen } from "@/test/react-dom-harness"import { renderCommunity as render, renderCommunityHook } from "@/test/community-owner-harness"import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"import { ChannelRoute } from "./channel-route"+import { ThreadSplitView } from "./thread-split-view"import { useChannelRouteModel } from "@/hooks/community/use-channel-route-model"import { ForumChannelSurface } from "./forum-channel-surface"import { MessageList } from "../messages/message-list"@@ -242,7 +243,7 @@ vi.mock("@/components/community/channels/thread-split-parent-surface", () => ({ThreadSplitParentSurface: mockSplitParentSurface,}))vi.mock("@/components/community/channels/thread-split-view", () => ({- ThreadSplitView: ({+ ThreadSplitView: vi.fn(({split,layoutPending = false,parent,@@ -275,7 +276,7 @@ vi.mock("@/components/community/channels/thread-split-view", () => ({{ "data-testid": conversationSubtype === "thread" ? "community-thread-split-panel" : undefined },thread,),- ),+ )),}))vi.mock("@/hooks/community/use-forum-opener-hint", () => ({useForumOpenerHint: () => mockForumOpener,@@ -1288,6 +1289,29 @@ describe("ChannelRoute message surface ownership", () => {await act(async () => renderer.unmount())})+ it.each(["desktop", "mobile"] as const)("keeps unknown %s route resolution outside the changing panel without hiding terminal Retry", breakpoint => {+ mockBreakpoint.value = breakpoint+ Object.assign(mockRouteModel, {+ server: null, channel: null, parent: null, currentChannelMeta: null,+ routeLifecycle: "pending", routeHydrated: false, skeletonSubtype: "unknown",+ })+ const node = () => React.createElement(ChannelRoute, { serverParam: "server_1", channelId: "channel_1" })+ const view = render(node())+ expect(vi.mocked(ThreadSplitView).mock.lastCall?.[0]).toMatchObject({ conversationSubtype: "unknown", resolvingParent: true })+ expect(mockedUseChannelMessageFeed).not.toHaveBeenCalled()+ Object.assign(mockRouteModel, { routeLifecycle: "terminal-error", metadataError: true })+ view.rerender(node())+ expect(vi.mocked(ThreadSplitView).mock.lastCall?.[0]).toMatchObject({ conversationSubtype: "unknown", resolvingParent: false })+ expect(screen.getByRole("button", { name: "Retry" })).not.toBeDisabled()+ fireEvent.click(screen.getByRole("button", { name: "Retry" }))+ expect(mockRouteModel.retryMetadata).toHaveBeenCalledTimes(1)+ Object.assign(mockRouteModel, { routeLifecycle: "pending", retryingMetadata: true })+ view.rerender(node())+ expect(vi.mocked(ThreadSplitView).mock.lastCall?.[0]).toMatchObject({ resolvingParent: false })+ expect(screen.getByRole("button", { name: "Retrying…" })).toBeDisabled()+ view.unmount()+ })+it("shows an authoritative split target before the effect-owned pointer commits", async () => {configureThreadRoute()mockSplitMode.value = "split"diff --git a/src/web/src/components/community/channels/channel-route.tsx b/src/web/src/components/community/channels/channel-route.tsxindex 073eff607..df609a6e2 100644--- a/src/web/src/components/community/channels/channel-route.tsx+++ b/src/web/src/components/community/channels/channel-route.tsx@@ -152,6 +152,7 @@ function ChannelRouteFrame(target: RouteTarget) {}, [setParentIdentity])const resolvingParent = split && routeModel.routeLifecycle !== "ready" &&(!parent || parentIdentity?.id !== parent.id || !parentIdentity.confirmed)+ const resolvingLayout = routeModel.routeLifecycle === "pending" && routeModel.skeletonSubtype === "unknown" && !routeModel.metadataErrorconst channelRefCandidates = useMemo(() => server?.categories.flatMap((category) => category.channels).map((channel) => toChannelRefCandidate(server, channel)) ?? [], [server])@@ -170,7 +171,7 @@ function ChannelRouteFrame(target: RouteTarget) {const targetHref = `${channelHref(serverParam, channelId)}${searchParams.size ? `?${searchParams}` : ""}`return <div ref={containerRef} data-community-target-href={targetHref} className="flex min-h-0 min-w-0 flex-1 flex-col max-sm:fixed max-sm:inset-0 max-sm:z-20 max-sm:bg-background"><ThreadSplitView- split={split} layoutPending={layoutPending} resolvingParent={resolvingParent} conversationSubtype={isThread ? "thread" : routeModel.skeletonSubtype}+ split={split} layoutPending={layoutPending} resolvingParent={resolvingLayout || resolvingParent} conversationSubtype={isThread ? "thread" : routeModel.skeletonSubtype}parent={split && parent ? <ThreadSplitParentSurfacekey={JSON.stringify([currentUser.id, serverId, parent.id])}serverId={serverId} serverParam={serverParam} server={server} channel={parent}diff --git a/src/web/src/components/community/channels/channel-sidebar-tree-owner.dom.test.tsx b/src/web/src/components/community/channels/channel-sidebar-tree-owner.dom.test.tsxindex 4b1bd659c..74350ca73 100644--- a/src/web/src/components/community/channels/channel-sidebar-tree-owner.dom.test.tsx+++ b/src/web/src/components/community/channels/channel-sidebar-tree-owner.dom.test.tsx@@ -1,4 +1,5 @@import { createElement } from "react"+import { renderToString } from "react-dom/server"import { describe, expect, it, vi } from "vitest"import { fireEvent, render, screen, setupUser } from "@/test/react-dom-harness"import type { Category } from "@/lib/community/models/navigation"@@ -65,20 +66,34 @@ describe("ChannelSidebarScope", () => {])})- it("reveals restored rows immediately while forum projection is pending", () => {+ it("includes both the primary tree and cached posts in the initial render", () => {+ const html = renderToString(createElement(ChannelSidebarRevealBoundary, {+ ...scopeProps(targetCategories),+ categories: targetCategories,+ primaryReady: true,+ forumProjectionMissing: false,+ forumThreadsByParent: {+ "target-one": [{ id: "thread-one", parentChannelId: "target-one", parentMessageId: "opener-one", title: "Cached post", activityAt: "2026-09-25T00:00:00.000Z", expiresAt: "2026-09-28T00:00:00.000Z", unread: false }],+ },+ }))+ expect(html).toContain(tid.channelRow("target-one"))+ expect(html).toContain(tid.forumSidebarThread("thread-one"))+ expect(html).not.toContain(tid.channelSidebarPending("target"))+ })++ it("keeps restored primary rows hidden while forum projection is pending", () => {render(createElement(ChannelSidebarRevealBoundary, {...scopeProps(targetCategories),categories: targetCategories,primaryReady: true,forumProjectionMissing: true,- trustedRestoredPrimary: true,}))- expect(screen.getByTestId(tid.channelRow("target-one"))).toBeInTheDocument()- expect(screen.queryByTestId(tid.channelSidebarPending("target"))).not.toBeInTheDocument()+ expect(screen.queryByTestId(tid.channelRow("target-one"))).not.toBeInTheDocument()+ expect(screen.getByTestId(tid.channelSidebarPending("target"))).toBeInTheDocument()})- it("reveals asynchronously restored primary rows while forum projection stays pending", () => {+ it("waits for forum readiness when primary restoration finishes asynchronously", () => {const base = {...scopeProps(targetCategories),categories: targetCategories,@@ -87,18 +102,16 @@ describe("ChannelSidebarScope", () => {const rendered = render(createElement(ChannelSidebarRevealBoundary, {...base,primaryReady: false,- trustedRestoredPrimary: false,}))expect(screen.getByTestId(tid.channelSidebarPending("target"))).toBeInTheDocument()rendered.rerender(createElement(ChannelSidebarRevealBoundary, {...base,primaryReady: true,- trustedRestoredPrimary: true,}))- expect(screen.getByTestId(tid.channelRow("target-one"))).toBeInTheDocument()- expect(screen.queryByTestId(tid.channelSidebarPending("target"))).not.toBeInTheDocument()+ expect(screen.queryByTestId(tid.channelRow("target-one"))).not.toBeInTheDocument()+ expect(screen.getByTestId(tid.channelSidebarPending("target"))).toBeInTheDocument()})it("keeps true-cold primary rows hidden until forum is ready, then preserves the DOM", () => {@@ -110,7 +123,6 @@ describe("ChannelSidebarScope", () => {...base,primaryReady: false,forumProjectionMissing: true,- trustedRestoredPrimary: false,}))expect(screen.getByTestId(tid.channelSidebarPending("target"))).toBeInTheDocument()@@ -118,7 +130,6 @@ describe("ChannelSidebarScope", () => {...base,primaryReady: true,forumProjectionMissing: true,- trustedRestoredPrimary: false,}))expect(screen.getByTestId(tid.channelSidebarPending("target"))).toBeInTheDocument()@@ -126,7 +137,6 @@ describe("ChannelSidebarScope", () => {...base,primaryReady: true,forumProjectionMissing: false,- trustedRestoredPrimary: false,}))const owner = rendered.container.querySelector("[data-community-channel-tree-scope]")const scroll = screen.getByTestId(tid.channelSidebarScroll)@@ -136,7 +146,6 @@ describe("ChannelSidebarScope", () => {...base,primaryReady: true,forumProjectionMissing: true,- trustedRestoredPrimary: false,}))expect(rendered.container.querySelector("[data-community-channel-tree-scope]")).toBe(owner)expect(screen.getByTestId(tid.channelSidebarScroll)).toBe(scroll)@@ -146,7 +155,6 @@ describe("ChannelSidebarScope", () => {...base,primaryReady: true,forumProjectionMissing: false,- trustedRestoredPrimary: false,}))expect(rendered.container.querySelector("[data-community-channel-tree-scope]")).toBe(owner)expect(screen.getByTestId(tid.channelSidebarScroll)).toBe(scroll)diff --git a/src/web/src/components/community/channels/channel-sidebar-tree-owner.tsx b/src/web/src/components/community/channels/channel-sidebar-tree-owner.tsxindex 88410bc5a..a08cd6aca 100644--- a/src/web/src/components/community/channels/channel-sidebar-tree-owner.tsx+++ b/src/web/src/components/community/channels/channel-sidebar-tree-owner.tsx@@ -29,33 +29,28 @@ export type ChannelSidebarRevealBoundaryProps = Omit<categories: Category[]primaryReady: booleanforumProjectionMissing: boolean- trustedRestoredPrimary: boolean}/**- * A trusted restored primary tree reveals even when it arrives asynchronously- * and the non-persisted forum projection is still pending. A true-cold tree- * reveals once, after its primary data and initial forum projection are both- * ready. Later forum refetches never hide or remount the revealed tree.+ * Reveal the complete target tree once both primary and forum data are ready.+ * Later forum refetches must not hide or remount the revealed tree.*/export function ChannelSidebarRevealBoundary({categories,primaryReady,forumProjectionMissing,- trustedRestoredPrimary,...scopeProps}: ChannelSidebarRevealBoundaryProps) {- const [revealed, setRevealed] = useAtom(useCreateAtom(primaryReady && trustedRestoredPrimary))+ const ready = primaryReady && !forumProjectionMissing+ const [revealed, setRevealed] = useAtom(useCreateAtom(ready))useEffect(() => {- if (primaryReady && (trustedRestoredPrimary || !forumProjectionMissing)) {- setRevealed(true)- }- }, [forumProjectionMissing, primaryReady, setRevealed, trustedRestoredPrimary])+ if (ready) setRevealed(true)+ }, [ready, setRevealed])return (<ChannelSidebarScope- categories={primaryReady && revealed ? categories : null}+ categories={primaryReady && (revealed || ready) ? categories : null}{...scopeProps}/>)@@ -76,9 +71,7 @@ export function ChannelSidebarScope({return (<ChannelSidebarSkeletonnoHeader={sidebarProps.noHeader}- showInviteAction={Boolean(- sidebarProps.serverId && sidebarProps.onInvitePopoverOpenChange,- )}+ showInviteAction={Boolean(sidebarProps.serverId)}targetServerId={targetServerId}/>)diff --git a/src/web/src/components/community/channels/channel-sidebar.header.dom.test.tsx b/src/web/src/components/community/channels/channel-sidebar.header.dom.test.tsxnew file mode 100644index 000000000..8d618f1f7--- /dev/null+++ b/src/web/src/components/community/channels/channel-sidebar.header.dom.test.tsx@@ -0,0 +1,65 @@+import { expect, it, vi } from "vitest"+import { fireEvent, render, setupUser } from "@/test/react-dom-harness"+import { CommunityTestProvider } from "@/test/community-owner-fixture"+import { createCommunityQueryOwner } from "@/test/community-query-owner"+import { CurrentUserProvider } from "@/contexts/community/current-user"+import { ChannelSidebar } from "./channel-sidebar"+import { useChannelTree } from "./use-channel-tree"++it("preserves disabled header nodes, retires an open menu and restores only qualified actions", async () => {+ const { client, registry } = await createCommunityQueryOwner()+ const settings = vi.fn()+ const invite = vi.fn()+ function Sidebar({ ready, manager = true }: { ready: boolean; manager?: boolean }) {+ const tree = useChannelTree([])+ return <ChannelSidebar tree={tree} serverName="Target server" serverId="target" activeChannel="" setActiveChannel={vi.fn()}+ isAdmin={ready && manager} onOpenSettings={ready && manager ? settings : undefined}+ onInvitePopoverOpenChange={ready ? invite : undefined} />+ }+ const node = (ready: boolean, manager = true) => <CommunityTestProvider client={client} registry={registry}>+ <CurrentUserProvider initialUser={{ id: "viewer", email: "[email protected]", name: "Viewer", avatar: "V" }}>+ <Sidebar ready={ready} manager={manager} />+ </CurrentUserProvider>+ </CommunityTestProvider>+ const view = render(node(false))+ const title = view.getByRole("button", { name: "Target server" })+ const inviteButton = view.getByRole("button", { name: "Invite to server" })+ const arrow = title.querySelector("svg")+ expect(arrow).not.toBeNull()+ const assertDisabled = () => {+ expect(view.getByRole("button", { name: "Target server" })).toBe(title)+ expect(view.getByRole("button", { name: "Invite to server" })).toBe(inviteButton)+ expect(title.querySelector("svg")).toBe(arrow)+ expect(title).toBeDisabled()+ expect(inviteButton).toBeDisabled()+ fireEvent.click(title)+ fireEvent.keyDown(title, { key: "Enter" })+ fireEvent.click(inviteButton)+ expect(view.queryByRole("menu")).toBeNull()+ expect(settings).not.toHaveBeenCalled()+ expect(invite).not.toHaveBeenCalled()+ }+ assertDisabled()+ view.rerender(node(true))+ expect(view.getByRole("button", { name: "Target server" })).toBe(title)+ expect(view.getByRole("button", { name: "Invite to server" })).toBe(inviteButton)+ expect(title).toBeEnabled()+ expect(inviteButton).toBeEnabled()+ const user = setupUser()+ await user.click(title)+ expect(await view.findByRole("menuitem", { name: "Overview" })).toBeVisible()+ view.rerender(node(false))+ assertDisabled()+ view.rerender(node(true))+ expect(view.queryByRole("menu")).toBeNull()+ await user.click(title)+ await user.click(await view.findByRole("menuitem", { name: "Overview" }))+ expect(settings).toHaveBeenCalledExactlyOnceWith("overview")+ await user.click(inviteButton)+ expect(invite).toHaveBeenCalledExactlyOnceWith(true)+ view.rerender(node(true, false))+ expect(view.getByRole("button", { name: "Target server" })).toBe(title)+ expect(title).toBeDisabled()+ expect(inviteButton).toBeEnabled()+ expect(view.queryByRole("menu")).toBeNull()+})diff --git a/src/web/src/components/community/channels/channel-sidebar.tsx b/src/web/src/components/community/channels/channel-sidebar.tsxindex bdd7a60d5..e14c9eb7f 100644--- a/src/web/src/components/community/channels/channel-sidebar.tsx+++ b/src/web/src/components/community/channels/channel-sidebar.tsx@@ -1,6 +1,7 @@"use client"import type { ContextMenu as ContextMenuPrimitive } from "@base-ui/react/context-menu"+import type { Menu as MenuPrimitive } from "@base-ui/react/menu"import { useAtom, useCreateAtom } from "@tanstack/react-store";import { OfficialServerBadge } from "../official-server-badge"import { CommunityNavigationLink } from "../shell/community-navigation-link"@@ -79,6 +80,13 @@ function ChannelSidebarContent({const scrollRef = useRef<HTMLDivElement>(null)useCommunityDndScrolling(scrollRef, "community/channel-tree")const menuActionsRef = useRef<ContextMenuPrimitive.Root.Actions | null>(null)+ const headerMenuActionsRef = useRef<MenuPrimitive.Root.Actions | null>(null)+ useEffect(() => {+ if (!onOpenSettings) {+ headerMenuActionsRef.current?.close()+ headerMenuActionsRef.current?.unmount()+ }+ }, [onOpenSettings])useEffect(() => {if (!isAdmin) {menuActionsRef.current?.close()@@ -237,40 +245,39 @@ function ChannelSidebarContent({{!noHeader && (<header className="relative flex h-12 items-center gap-1 border-b border-border/40 px-2"><OfficialServerBadge official={official} className="absolute left-1 top-0.5 z-1" />- {serverName && onOpenSettings ? (- <DropdownMenu>- <DropdownMenuTrigger className="flex h-11 min-w-0 max-w-full items-center gap-2 rounded-md px-2 hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none sm:h-auto sm:py-1">- <span className="min-w-0 truncate pr-1 font-brand text-[1.75rem] leading-none font-bold">{serverName}</span>- <ChevronDown className="size-4 shrink-0 text-muted-foreground" />- </DropdownMenuTrigger>+ <DropdownMenu disabled={!onOpenSettings} actionsRef={headerMenuActionsRef}>+ <DropdownMenuTrigger disabled={!onOpenSettings} className="flex h-11 min-w-0 max-w-full items-center gap-2 rounded-md px-2 enabled:hover:bg-accent disabled:cursor-not-allowed focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none sm:h-auto sm:py-1">+ <span className="min-w-0 truncate pr-1 font-brand text-[1.75rem] leading-none font-bold">{serverName || "\u00a0"}</span>+ <ChevronDown className="size-4 shrink-0 text-muted-foreground" />+ </DropdownMenuTrigger>+ {onOpenSettings && (<DropdownMenuContent align="start" className="w-48"><DropdownMenuItem onClick={() => onOpenSettings("overview")} data-testid={tid.serverSettingsOpen}><Settings className="size-4" /> Overview</DropdownMenuItem><DropdownMenuItem onClick={() => onOpenSettings("members")}><Users className="size-4" /> Members</DropdownMenuItem><DropdownMenuItem onClick={() => onOpenSettings("invites")}><Link2 className="size-4" /> Invites</DropdownMenuItem><DropdownMenuItem onClick={() => onOpenSettings("notifications")}><Bell className="size-4" /> Notifications</DropdownMenuItem></DropdownMenuContent>- </DropdownMenu>- ) : (- <span className="flex min-w-0 max-w-full items-center gap-2 px-2">- <span className="min-w-0 truncate pr-1 font-brand text-[1.75rem] leading-none font-bold">{serverName || "\u00a0"}</span>- </span>- )}- {serverId && onInvitePopoverOpenChange && (+ )}+ </DropdownMenu>+ {serverId && (<><button- onClick={() => onInvitePopoverOpenChange(true)}- className="ml-auto grid size-7 shrink-0 place-items-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none"+ onClick={() => onInvitePopoverOpenChange?.(true)}+ disabled={!onInvitePopoverOpenChange}+ className="ml-auto grid size-7 shrink-0 place-items-center rounded-md text-muted-foreground enabled:hover:bg-accent enabled:hover:text-foreground disabled:cursor-not-allowed focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none"aria-label="Invite to server"title="Invite to server"><UserPlus className="size-4" /></button>- <InviteDialog- open={!!invitePopoverOpen}- onOpenChange={onInvitePopoverOpenChange}- serverId={serverId}- serverName={serverName}- />+ {onInvitePopoverOpenChange && (+ <InviteDialog+ open={!!invitePopoverOpen}+ onOpenChange={onInvitePopoverOpenChange}+ serverId={serverId}+ serverName={serverName}+ />+ )}</>)}</header>diff --git a/src/web/src/components/community/channels/thread-split-view.dom.test.ts b/src/web/src/components/community/channels/thread-split-view.dom.test.tsindex e63b45ee6..cd369fa7d 100644--- a/src/web/src/components/community/channels/thread-split-view.dom.test.ts+++ b/src/web/src/components/community/channels/thread-split-view.dom.test.ts@@ -180,12 +180,15 @@ describe("ThreadSplitView", () => {it("keeps the target input, section, panel and group across type resolution and layout changes", () => {const thread = createElement("input", { "data-testid": "target-input" })const renderer = render(createElement(ThreadSplitView, {- split: false, parent: null, thread, conversationSubtype: "unknown",+ split: false, parent: null, thread, conversationSubtype: "unknown", resolvingParent: true,}))const group = screen.getByTestId("panel-group")const panel = screen.getByTestId("panel-thread")const section = screen.getByLabelText("Conversation")const input = screen.getByTestId("target-input") as HTMLInputElement+ expect(group).toHaveAttribute("data-inert", "true")+ expect(group).toHaveAttribute("data-hidden", "true")+ expect(group).toHaveAttribute("data-persists-layout", "false")input.value = "Target draft"for (const split of [false, true, false, true]) {renderer.rerender(createElement(ThreadSplitView, {@@ -196,6 +199,8 @@ describe("ThreadSplitView", () => {expect(screen.getByTestId("community-thread-split-panel")).toBe(section)expect(screen.getByTestId("target-input")).toBe(input)expect(input.value).toBe("Target draft")+ expect(group).toHaveAttribute("data-inert", "undefined")+ expect(group).toHaveAttribute("data-hidden", "undefined")expect(panel).toHaveAttribute("data-min-size", String(THREAD_SPLIT_PANEL_MIN_WIDTH))expect(panel).toHaveAttribute("data-max-size", String(THREAD_SPLIT_PANEL_MAX_WIDTH))}diff --git a/src/web/src/components/community/channels/thread-split-view.native.dom.test.tsx b/src/web/src/components/community/channels/thread-split-view.native.dom.test.tsxindex 72aa8016b..4f0eda9e7 100644--- a/src/web/src/components/community/channels/thread-split-view.native.dom.test.tsx+++ b/src/web/src/components/community/channels/thread-split-view.native.dom.test.tsx@@ -65,6 +65,39 @@ function nativeGeometry(initialWidth: number) {}describe("ThreadSplitView actual native persistence", () => {+ it.each(["full", "pending", "split"] as const)("keeps unresolved native content behind resolution before %s admission", async mode => {+ nativeGeometry(905)+ vi.stubGlobal("IntersectionObserver", class { observe() {} disconnect() {} })+ const write = vi.spyOn(Storage.prototype, "setItem")+ const thread = createElement("input", { defaultValue: "Keep target draft" })+ const parent = createElement("span", null, "Parent")+ const view = render(createElement(ThreadSplitView, { split: false, conversationSubtype: "unknown", resolvingParent: true, parent, thread }))+ try {+ const group = view.container.querySelector("[data-group]")!+ const panel = view.container.querySelector("#thread")!+ const input = panel.querySelector("input")!+ expect(group).toHaveAttribute("aria-hidden", "true")+ expect(group).toHaveAttribute("inert")+ expect(group).toHaveClass("invisible")+ expect(view.getByLabelText("Resolving conversation")).toBeVisible()+ view.rerender(createElement(ThreadSplitView, { split: mode === "split", layoutPending: mode === "pending", conversationSubtype: "thread", parent, thread }))+ expect(view.container.querySelector("[data-group]")).toBe(group)+ expect(view.container.querySelector("#thread")).toBe(panel)+ expect(panel.querySelector("input")).toBe(input)+ expect(input.value).toBe("Keep target draft")+ expect(group).not.toHaveAttribute("aria-hidden")+ expect(group).not.toHaveAttribute("inert")+ expect(group).not.toHaveClass("invisible")+ expect(view.queryByLabelText("Resolving conversation")).toBeNull()+ await act(async () => { await Promise.resolve() })+ expect(write).not.toHaveBeenCalled()+ } finally {+ view.unmount()+ vi.unstubAllGlobals()+ vi.restoreAllMocks()+ }+ })+it("applies pending stylesheet geometry to the native group flex items", () => {const browser = windowlet html: stringdiff --git a/src/web/src/components/community/shell/server-sidebar-slot.identity.dom.test.tsx b/src/web/src/components/community/shell/server-sidebar-slot.identity.dom.test.tsxindex aa116bb78..e549ea263 100644--- a/src/web/src/components/community/shell/server-sidebar-slot.identity.dom.test.tsx+++ b/src/web/src/components/community/shell/server-sidebar-slot.identity.dom.test.tsx@@ -47,6 +47,7 @@ it.each([false, true])("keeps real same-server list, row and category nodes throreturn <CommunityRouteContext value={{ breakpoint: "mobile", frame, navigation, ownerDeleteRouteScope: { serverId: server.id, token } }}><output data-testid="pending">{String(navigation.navigationPending)}</output><button onClick={() => navigation.replace("/c/channels/target", { resume: true })}>Return</button>+ <button onClick={() => navigation.cancelPendingNavigation()}>Cancel navigation</button><ServerSidebarSlot serverId={server.id} href={navigation.pendingHref ?? frame.href} routeCommitted={!navigation.navigationPending} /></CommunityRouteContext>}@@ -58,6 +59,8 @@ it.each([false, true])("keeps real same-server list, row and category nodes throconst view = render(node("/c/channels/target", 0))const scroll = await view.findByTestId(tid.channelSidebarScroll)const row = view.getByTestId(tid.channelRow("channel"))+ const title = view.getByRole("button", { name: "Target server" })+ const invite = view.getByRole("button", { name: "Invite to server" })expect(row).toHaveAttribute("aria-roledescription", "draggable")const header = grouped ? view.getByText("Group") : nullscroll.scrollTop = 37@@ -67,12 +70,19 @@ it.each([false, true])("keeps real same-server list, row and category nodes throexpect.soft(view.getByTestId(tid.channelSidebarScroll).scrollTop).toBe(37)expect.soft(view.getByTestId(tid.channelRow("channel"))).toBe(row)expect.soft(view.getByTestId(tid.channelRow("channel"))).toHaveAttribute("data-retained-row", "original")+ expect.soft(view.getByRole("button", { name: "Target server" })).toBe(title)+ expect.soft(view.getByRole("button", { name: "Invite to server" })).toBe(invite)if (header) expect.soft(view.getByText("Group")).toBe(header)}fireEvent.click(row)expect(mocks.push).toHaveBeenCalledExactlyOnceWith("/c/channels/target/channel")expect(view.getByTestId("pending")).toHaveTextContent("true")assertNodes()+ expect(title).toBeDisabled()+ expect(invite).toBeDisabled()+ fireEvent.click(title)+ fireEvent.click(invite)+ expect(view.queryByRole("dialog")).toBeNull()expect(row).not.toHaveAttribute("aria-roledescription")fireEvent.contextMenu(view.getByTestId(tid.channelSidebarScroll), { button: 2 })expect(view.queryByRole("menu")).toBeNull()@@ -80,6 +90,8 @@ it.each([false, true])("keeps real same-server list, row and category nodes throview.rerender(node(mocks.pathname, 1))await waitFor(() => expect(view.getByTestId("pending")).toHaveTextContent("false"))assertNodes()+ expect(title).toBeEnabled()+ expect(invite).toBeEnabled()fireEvent.click(view.getByRole("button", { name: "Return" }))expect(mocks.replace).toHaveBeenCalledExactlyOnceWith("/c/channels/target")expect(view.getByTestId("pending")).toHaveTextContent("true")@@ -89,6 +101,15 @@ it.each([false, true])("keeps real same-server list, row and category nodes throawait waitFor(() => expect(view.getByTestId("pending")).toHaveTextContent("false"))assertNodes()expect(row).toHaveAttribute("aria-roledescription", "draggable")+ fireEvent.click(row)+ expect(view.getByTestId("pending")).toHaveTextContent("true")+ expect(title).toBeDisabled()+ expect(invite).toBeDisabled()+ fireEvent.click(view.getByRole("button", { name: "Cancel navigation" }))+ expect(view.getByTestId("pending")).toHaveTextContent("false")+ assertNodes()+ expect(title).toBeEnabled()+ expect(invite).toBeEnabled()const user = setupUser()act(() => row.focus())await user.keyboard(" ")diff --git a/src/web/src/components/community/shell/server-sidebar-slot.target.dom.test.tsx b/src/web/src/components/community/shell/server-sidebar-slot.target.dom.test.tsxindex 396056e3a..d8c2db920 100644--- a/src/web/src/components/community/shell/server-sidebar-slot.target.dom.test.tsx+++ b/src/web/src/components/community/shell/server-sidebar-slot.target.dom.test.tsx@@ -1,6 +1,6 @@import { IsRestoringProvider } from "@tanstack/react-query"import { beforeEach, expect, it, vi } from "vitest"-import { render } from "@/test/react-dom-harness"+import { act, fireEvent, render, waitFor } from "@/test/react-dom-harness"import { CommunityTestProvider } from "@/test/community-owner-fixture"import { createCommunityQueryOwner } from "@/test/community-query-owner"import { CurrentUserProvider } from "@/contexts/community/current-user"@@ -9,12 +9,14 @@ import { normalizeCommunityHref } from "@/lib/community/community-route"import { communityKeys } from "@/lib/query-keys"import { captureCommunityLiveSnapshotToken, publishCommunityLiveSnapshot } from "@/lib/community-db/sync"import { createOwnerServerDeleteRouteToken } from "@/lib/community/eject-server"+import { serversProjectedQueryFn } from "@/hooks/community/use-servers"+import { getActiveAccountUnreadProjection } from "@/hooks/community/account-unread-projection"import { ServerSidebarSlot } from "./server-sidebar-slot"-const mocks = vi.hoisted(() => ({ pathname: "/c/channels/source/channel", replace: vi.fn(), members: vi.fn(), presence: vi.fn(), props: vi.fn(), load: vi.fn() }))-vi.mock("next/navigation", () => ({ useRouter: () => ({ replace: mocks.replace }), usePathname: () => mocks.pathname, useSearchParams: () => new URLSearchParams("settings=1") }))+const mocks = vi.hoisted(() => ({ pathname: "/c/channels/source/channel", search: "settings=1", breakpoint: "desktop", replace: vi.fn(), members: vi.fn(), presence: vi.fn(), props: vi.fn(), load: vi.fn() }))+vi.mock("next/navigation", () => ({ useRouter: () => ({ replace: mocks.replace }), usePathname: () => mocks.pathname, useSearchParams: () => new URLSearchParams(mocks.search) }))vi.mock("@/lib/api/client", async original => ({ ...await original<typeof import("@/lib/api/client")>(), apiFetch: mocks.load }))-vi.mock("@/hooks/use-mobile", () => ({ useBreakpoint: () => "desktop", useIsMobile: () => false }))+vi.mock("@/hooks/use-mobile", () => ({ useBreakpoint: () => mocks.breakpoint, useIsMobile: () => mocks.breakpoint === "mobile" }))vi.mock("@/hooks/community/use-server-members", () => ({ useServerMembers: (id: string | null) => { mocks.members(id); return { members: [] } } }))vi.mock("@/hooks/community/use-server-panels", () => ({ usePresence: mocks.presence }))vi.mock("@/components/community/channels/channel-sidebar-tree-owner", () => ({ ChannelSidebarRevealBoundary: (props: { serverName: string; categories: Array<{ channels: Array<{ id: string; name: string }> }> }) => {@@ -22,7 +24,7 @@ vi.mock("@/components/community/channels/channel-sidebar-tree-owner", () => ({ Creturn <aside><h1>{props.serverName}</h1><input aria-label="Sidebar state" />{props.categories.flatMap(category => category.channels).map(channel => <span key={channel.id}>{channel.name}</span>)}</aside>} }))vi.mock("@/components/community/settings/server-settings", () => ({ ServerSettings: () => <div>Server settings</div> }))-beforeEach(() => { vi.clearAllMocks(); mocks.pathname = "/c/channels/source/channel"; mocks.load.mockImplementation(() => new Promise(() => {})) })+beforeEach(() => { vi.clearAllMocks(); mocks.pathname = "/c/channels/source/channel"; mocks.search = "settings=1"; mocks.breakpoint = "desktop"; mocks.load.mockImplementation(() => new Promise(() => {})) })it("uses the canonical target sidebar before commit, retaining its node while deferred side effects gain the real route", async () => {const { client, registry } = await createCommunityQueryOwner()@@ -61,3 +63,102 @@ it("uses the canonical target sidebar before commit, retaining its node while deexpect(mocks.members).toHaveBeenLastCalledWith("target")expect(mocks.presence).toHaveBeenLastCalledWith("target")})++it.each(["primary", "forum"])("ends a failed cold %s read with retry", async kind => {+ const { client, registry } = await createCommunityQueryOwner()+ const server = { id: "target", name: "Target server", discriminator: "0001", description: "", icon: null, ownerId: "viewer" }+ publishCommunityLiveSnapshot(client, {+ snapshot: { kind: "servers", data: { servers: [{ ...server, initial: "T", active: false, unread: false, mentions: 0 }] } },+ proof: { kind: "structural", token: captureCommunityLiveSnapshotToken(client), signal: undefined },+ })+ client.setQueryData(communityKeys.servers(), [server.id])+ let fail = true+ mocks.load.mockImplementation((url: string) => {+ if (url === "/api/community/servers/target/categories") {+ return kind === "primary" && fail ? Promise.reject(new Error("Temporary read failure")) : Promise.resolve({ categories: [] })+ }+ if (url === "/api/community/servers/target/channels") return Promise.resolve({ channels: kind === "forum" ? [{ id: "forum", name: "Forum", type: "forum", categoryId: null, position: 0 }] : [] })+ if (url.startsWith("/api/community/servers/target/channels?")) {+ return kind === "forum" && fail ? Promise.reject(new Error("Forum unavailable")) : Promise.resolve({ channels: [], included: { parentMessages: [] }, serverNow: new Date().toISOString() })+ }+ return new Promise(() => {})+ })+ mocks.pathname = "/c/channels/target"+ const token = createOwnerServerDeleteRouteToken(client)+ const view = render(<CommunityTestProvider client={client} registry={registry}>+ <CurrentUserProvider initialUser={{ id: "viewer", name: "Viewer", avatar: "V", email: "[email protected]" }}>+ <CommunityRouteContext value={{ frame: { ...normalizeCommunityHref(mocks.pathname), revision: 0 }, navigation: { captureIntent: () => () => true, navigationPending: false, pendingHref: null }, ownerDeleteRouteScope: { serverId: "target", token } } as never}>+ <ServerSidebarSlot serverId="target" />+ </CommunityRouteContext>+ </CurrentUserProvider>+ </CommunityTestProvider>)+ expect(await view.findByRole("alert")).toHaveTextContent(kind === "primary" ? "Couldn't load server channels." : "Couldn't load forum posts.")+ expect(view.queryByText("Target server")).toBeNull()+ expect(view.getByRole("button", { name: "Retry" })).toBeEnabled()+ fail = false+ fireEvent.click(view.getByRole("button", { name: "Retry" }))+ await waitFor(() => expect(view.queryByRole("alert")).toBeNull())+ expect(view.getByText("Target server")).toBeVisible()+ expect(mocks.load.mock.calls.filter(([path]) => path === "/api/community/servers/target/categories")).toHaveLength(kind === "primary" ? 2 : 1)+ expect(mocks.props).toHaveBeenLastCalledWith(expect.objectContaining({ categories: kind === "primary" ? [] : expect.arrayContaining([expect.objectContaining({ channels: [expect.objectContaining({ id: "forum" })] })]), primaryReady: true, forumProjectionMissing: false }))+})+++it.each([+ { marker: "settings", role: "owner", order: "detail-first" }, { marker: "invite", role: "owner", order: "detail-first" },+ { marker: "settings", role: "member", order: "detail-first" },+ { marker: "settings", role: "owner", order: "owner-first" }, { marker: "invite", role: "owner", order: "owner-first" },+])("preserves a mobile first $marker intent through $role qualification with $order", async ({ marker, role, order }) => {+ const { client, registry } = await createCommunityQueryOwner()+ const server = { id: "target", name: "Target server", discriminator: "0001", description: "", icon: null, ownerId: "viewer" }+ mocks.pathname = "/c/channels/target"+ mocks.search = `${marker}=1&keep=${marker}`+ mocks.breakpoint = "mobile"+ const token = createOwnerServerDeleteRouteToken(client)+ const node = (committed = true) => <CommunityTestProvider client={client} registry={registry}>+ <CurrentUserProvider initialUser={{ id: "viewer", name: "Viewer", avatar: "V", email: "[email protected]" }}>+ <IsRestoringProvider value>+ <CommunityRouteContext value={{ frame: { ...normalizeCommunityHref(mocks.pathname), revision: 1 }, navigation: { captureIntent: () => () => true, navigationPending: !committed, pendingHref: null }, ownerDeleteRouteScope: { serverId: "target", token } } as never}>+ <ServerSidebarSlot serverId="target" routeCommitted={committed} />+ </CommunityRouteContext>+ </IsRestoringProvider>+ </CurrentUserProvider>+ </CommunityTestProvider>+ const view = render(node())+ await waitFor(() => expect(mocks.replace).toHaveBeenCalledWith(`/c/channels/target?keep=${marker}`))+ mocks.search = `keep=${marker}`+ view.rerender(node())+ const qualify = async () => {+ mocks.load.mockResolvedValueOnce({ servers: [{ ...server, role, memberId: "membership" }] })+ await act(async () => { await client.query({ queryKey: communityKeys.servers(), queryFn: serversProjectedQueryFn(getActiveAccountUnreadProjection(client), client), staleTime: 0 }) })+ }+ if (order === "owner-first") {+ await qualify()+ await waitFor(() => expect(mocks.props).toHaveBeenLastCalledWith(expect.objectContaining({ onOpenSettings: expect.any(Function) })))+ expect(view.queryByText("Server settings")).toBeNull()+ }+ act(() => { publishCommunityLiveSnapshot(client, { snapshot: { kind: "server-detail", data: { ...server, categories: [] } }, proof: { kind: "structural", token: captureCommunityLiveSnapshotToken(client), signal: undefined } }) })+ await waitFor(() => expect(mocks.props).toHaveBeenLastCalledWith(expect.objectContaining({ serverName: "Target server", onOpenSettings: undefined, onInvitePopoverOpenChange: undefined })))+ expect(view.queryByText("Server settings")).toBeNull()+ if (order === "detail-first") await qualify()+ act(() => { client.setQueryData(communityKeys.server(server.id), server.id) })+ view.rerender(node())+ if (role === "member") {+ expect(view.queryByText("Server settings")).toBeNull()+ mocks.load.mockResolvedValueOnce({ servers: [{ ...server, role: "owner", memberId: "membership" }] })+ await act(async () => { await client.query({ queryKey: communityKeys.servers(), queryFn: serversProjectedQueryFn(getActiveAccountUnreadProjection(client), client), staleTime: 0 }) })+ await waitFor(() => expect(mocks.props).toHaveBeenLastCalledWith(expect.objectContaining({ onOpenSettings: expect.any(Function) })))+ expect(view.queryByText("Server settings")).toBeNull()+ return+ }+ if (marker === "settings") expect(await view.findByText("Server settings")).toBeVisible()+ else await waitFor(() => expect(mocks.props).toHaveBeenLastCalledWith(expect.objectContaining({ invitePopoverOpen: true, onInvitePopoverOpenChange: expect.any(Function) })))+ view.rerender(node(false))+ await waitFor(() => {+ if (marker === "settings") expect(view.queryByText("Server settings")).toBeNull()+ else expect(mocks.props).toHaveBeenLastCalledWith(expect.objectContaining({ invitePopoverOpen: false }))+ })+ view.rerender(node())+ expect(view.queryByText("Server settings")).toBeNull()+ expect(mocks.props).toHaveBeenLastCalledWith(expect.objectContaining({ invitePopoverOpen: false }))+})diff --git a/src/web/src/components/community/shell/server-sidebar-slot.tsx b/src/web/src/components/community/shell/server-sidebar-slot.tsxindex b06e79370..3e36e015b 100644--- a/src/web/src/components/community/shell/server-sidebar-slot.tsx+++ b/src/web/src/components/community/shell/server-sidebar-slot.tsx@@ -80,7 +80,6 @@ import {import {useCanonicalProfilesByUserId,useOptionalCommunityDbRegistry,- useTrustedRestoredPrimary,useRouteChannelProjection,} from "@/lib/community-db/projections"@@ -106,7 +105,6 @@ function ServerSidebar({ serverId, href, routeCommitted }: { serverId: string; hconst router = useRouter()const communityDb = useOptionalCommunityDbRegistry()- const trustedRestoredPrimary = useTrustedRestoredPrimary()const cancelPendingNavigation = useCallback(() => {getCommunityRuntime(queryClient).ui.get().uiHandlers.cancelPendingNavigation?.()}, [queryClient])@@ -117,6 +115,9 @@ function ServerSidebar({ serverId, href, routeCommitted }: { serverId: string; hconst {server: currentServer,data: authoritativeServer,+ isError: serverReadFailed,+ isFetching: serverReadPending,+ refetch: retryServerRead,} = useServer(ownerDeleteRouteProtected || serverAccessRevoked ? null : serverId)const sidebarCategories = useMemo(() => currentServer?.categories ?? [],@@ -292,11 +293,21 @@ function ServerSidebar({ serverId, href, routeCommitted }: { serverId: string; h}, [serverId])const [serverSettingsOpen, setServerSettingsOpen] = useAtom(useCreateAtom(false))- const settingsView = useCommunityViewSource("server-settings:" + serverId, routeCommitted && serverSettingsOpen)+ const settingsAdmitted = !!currentServer && !sidebarHintOnly && isAdmin && serverSettingsOpen+ const settingsView = useCommunityViewSource("server-settings:" + serverId, settingsAdmitted)const [settingsSection, setSettingsSection] = useAtom(useCreateAtom<SettingsSection>("overview"))const [invitePopoverOpen, setInvitePopoverOpen] = useAtom(useCreateAtom(false))const [pendingIconCrop, setPendingIconCrop] = useAtom(useCreateAtom<{ src: string; fileName: string } | null>(null))+ const admittedDialogs = useRef({ settings: false, invite: false })+ useEffect(() => {+ const settings = settingsAdmitted+ const invite = !sidebarHintOnly && !!currentServer && invitePopoverOpen+ if (admittedDialogs.current.settings && !settings || !sidebarHintOnly && role !== undefined && !isAdmin) setServerSettingsOpen(false)+ if (admittedDialogs.current.invite && !invite) setInvitePopoverOpen(false)+ admittedDialogs.current = { settings, invite }+ }, [sidebarHintOnly, isAdmin, role, currentServer, settingsAdmitted, invitePopoverOpen, setServerSettingsOpen, setInvitePopoverOpen])+// Close server-scoped dialogs when the user navigates to another server —// without this, settings for server A would remain open after switching// to server B, mixing A's draft with B's loaded metadata.@@ -355,15 +366,16 @@ function ServerSidebar({ serverId, href, routeCommitted }: { serverId: string; hrouteCommitted,])- const categories = useMemo(() => sidebarCategories.map((category) => ({+ const displayCategories = forumSidebar.sidebar.server?.categories+ const categories = useMemo(() => (displayCategories ?? []).map((category) => ({...category,channels: category.channels.map((channel) =>forumSidebar.parentUnread[channel.id] === undefined? channel: { ...channel, unread: forumSidebar.parentUnread[channel.id] },),- })), [forumSidebar.parentUnread, sidebarCategories])- const sidebarDataReady = Boolean(currentServer)+ })), [forumSidebar.parentUnread, displayCategories])+ const sidebarDataReady = Boolean(forumSidebar.sidebar.server)const channelTreeScopeKey = `server:${serverId}`const setActiveChannel = useCallback((id: string) => {@@ -485,7 +497,6 @@ function ServerSidebar({ serverId, href, routeCommitted }: { serverId: string; hcategories={categories}primaryReady={sidebarDataReady}forumProjectionMissing={!forumSidebar.projectionReady}- trustedRestoredPrimary={trustedRestoredPrimary}targetServerId={serverId}{...channelProps}{...opts}@@ -497,11 +508,10 @@ function ServerSidebar({ serverId, href, routeCommitted }: { serverId: string; hforumSidebar.projectionReady,serverId,sidebarDataReady,- trustedRestoredPrimary,])const serverSettingsDialog = (- <Dialog open={serverSettingsOpen && !!currentServer && isAdmin} onOpenChange={(o) => { if (!o) closeSettings() }}>+ <Dialog open={settingsAdmitted} onOpenChange={(o) => { if (!o) closeSettings() }}><DialogContent className="flex h-dvh max-h-dvh w-screen max-w-none flex-col gap-0 overflow-hidden rounded-none p-0 sm:h-[calc(100vh-4rem)] sm:max-h-180 sm:w-[calc(100vw-4rem)] sm:max-w-4xl sm:rounded-xl" showCloseButton={false}><ServerSettingsisAdmin={isAdmin}@@ -601,5 +611,17 @@ function ServerSidebar({ serverId, href, routeCommitted }: { serverId: string; h/>)- return <>{sidebar()}{serverSettingsDialog}{iconCropDialog}</>+ return <>{serverReadFailed && !currentServer || forumSidebar.sidebar.status === "error" ? (+ <aside className="flex min-h-0 min-w-0 flex-1 flex-col">+ <div role="alert" className="flex flex-col gap-2 p-4 text-sm text-muted-foreground">+ <span>{serverReadFailed && !currentServer ? "Couldn't load server channels." : "Couldn't load forum posts."}</span>+ <button+ type="button"+ disabled={!routeCommitted || serverReadPending || forumSidebar.isFetching}+ onClick={() => { if (!currentServer) void retryServerRead(); else void forumSidebar.refetch() }}+ className="h-11 self-start rounded-md px-2 text-foreground enabled:hover:bg-accent disabled:cursor-not-allowed focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none sm:h-9"+ >Retry</button>+ </div>+ </aside>+ ) : sidebar()}{serverSettingsDialog}{iconCropDialog}</>}diff --git a/src/web/src/components/community/shell/use-hydrated-client.ts b/src/web/src/components/community/shell/use-hydrated-client.tsindex c141a0e8d..ee14e4254 100644--- a/src/web/src/components/community/shell/use-hydrated-client.ts+++ b/src/web/src/components/community/shell/use-hydrated-client.ts@@ -1,13 +1,3 @@"use client"-import { useSyncExternalStore } from "react"--const subscribe = () => () => {}--/**- * False for SSR and the matching hydration render, then true on the client.- * Use this when browser-only persisted state would otherwise change SSR output.- */-export function useHydratedClient() {- return useSyncExternalStore(subscribe, () => true, () => false)-}+export { useHydratedClient } from "@/hooks/use-hydrated-client"diff --git a/src/web/src/components/community/shell/use-shell-rail-controller.native.dom.test.tsx b/src/web/src/components/community/shell/use-shell-rail-controller.native.dom.test.tsxindex 595640af7..138747fc6 100644--- a/src/web/src/components/community/shell/use-shell-rail-controller.native.dom.test.tsx+++ b/src/web/src/components/community/shell/use-shell-rail-controller.native.dom.test.tsx@@ -39,7 +39,7 @@ vi.mock("@/hooks/community/use-server-members", () => ({ useServerMembers: () =>vi.mock("@/hooks/community/use-server-panels", async (original) => ({ ...await original<typeof import("@/hooks/community/use-server-panels")>(), usePresence: () => undefined }))vi.mock("@/hooks/community/use-forum-sidebar-threads", async (original) => ({...await original<typeof import("@/hooks/community/use-forum-sidebar-threads")>(),- useForumSidebarThreads: () => ({ threads: [], parentUnread: {}, projectionReady: true }),+ useForumSidebarThreads: (serverId: string) => ({ threads: [], parentUnread: {}, projectionReady: true, sidebar: { server: { id: serverId, categories: [] }, status: "ready" } }),}))vi.mock("@/hooks/community/use-notification-settings", async (original) => ({...await original<typeof import("@/hooks/community/use-notification-settings")>(),diff --git a/src/web/src/hooks/community/community-ws/invalidation-projections.ts b/src/web/src/hooks/community/community-ws/invalidation-projections.tsindex db32fbc38..6b502f987 100644--- a/src/web/src/hooks/community/community-ws/invalidation-projections.ts+++ b/src/web/src/hooks/community/community-ws/invalidation-projections.ts@@ -125,3 +125,7 @@ export function invalidateInvites(exact: true,})}++export function invalidateForumSidebar(projection: CommunityWsProjectionTransaction, serverId: string) {+ projection.fence("forum-sidebar-base", { queryKey: communityKeys.forumSidebarThreads(serverId), exact: true })+}diff --git a/src/web/src/hooks/community/community-ws/live-forum-window.dom.test.ts b/src/web/src/hooks/community/community-ws/live-forum-window.dom.test.tsnew file mode 100644index 000000000..a5a0bf450--- /dev/null+++ b/src/web/src/hooks/community/community-ws/live-forum-window.dom.test.ts@@ -0,0 +1,91 @@+import { canonicalRegistry, capturedOnMessage, capturedQueryClient, cleanupCommunityWsHarness, getCommunityApiFetchMock, hasCanonicalChannelNotify,+ mountCanonicalHook, mountHook, resetCommunityWsHarness, seedCanonicalForumSidebar } from "./test-harness"+import { act } from "@/test/react-dom-harness"+import { afterEach, beforeEach, describe, expect, it } from "vitest"+import { deriveCommunityDeliveryOperationId, encodeCommunityBrowserEventBatchForContract, prepareCommunityDeliveryEvents, type CommunityWsEvent } from "@alook/shared"+import { captureCommunityLiveSnapshotToken, getCanonicalCommunityChannels, getCanonicalCommunityMessages, publishCommunityChannelMetadata } from "@/lib/community-db/sync"+import { useForumSidebarThreads, type SidebarThreadEnvelope } from "../use-forum-sidebar-threads"+import { communityKeys } from "@/lib/query-keys"++beforeEach(resetCommunityWsHarness)+afterEach(cleanupCommunityWsHarness)+const serverId = "live-server"+function envelope(ids: string[]): SidebarThreadEnvelope {+ const now = new Date().toISOString()+ return { serverNow: now, channels: ids.map(id => ({ id, name: id, serverId, type: "thread", creatorId: "u_me", archived: false,+ parentChannelId: "forum_1", parentMessageId: `opener-${id}`, lastMessageAt: now, activityAt: now,+ expiresAt: new Date(Date.parse(now) + 72 * 60 * 60 * 1000).toISOString(), unread: false })),+ included: { parentMessages: ids.map(id => ({ id: `opener-${id}`, channelId: "forum_1", type: "chat", content: `Title ${id}`, seq: 1 })) } }+}++async function frame(events: CommunityWsEvent[], id: string) {+ const prepared = await prepareCommunityDeliveryEvents(events)+ if (!prepared.ok) throw new Error("invalid live window fixture")+ const encoded = await encodeCommunityBrowserEventBatchForContract({ operationId: await deriveCommunityDeliveryOperationId(id), prepared: prepared.prepared, contract: 2 })+ if (!encoded.ok) throw new Error("invalid live window wire")+ expect(encoded.batch.type).toBe("community:events.batch.v2")+ return encoded.batch+}++describe("live forum window participation convergence", () => {+ it.each([+ { signal: "batch", participates: true, retires: false }, { signal: "message", participates: true, retires: false },+ { signal: "create", participates: true, retires: false }, { signal: "activity", participates: true, retires: false },+ { signal: "batch", participates: false, retires: false }, { signal: "membership", participates: true, retires: false },+ { signal: "batch", participates: true, retires: true },+ ])("confirms $signal participation through the same window resource (eligible=$participates, retired=$retires)", async ({ signal, participates, retires }) => {+ await mountHook({ viewerUserId: "u_me" })+ seedCanonicalForumSidebar(serverId)+ const api = getCommunityApiFetchMock()+ const original = api.getMockImplementation()!+ let reads = 0+ let release!: (value: SidebarThreadEnvelope) => void+ api.mockImplementation((...args: unknown[]) => {+ if (String(args[0]).startsWith(`/api/community/servers/${serverId}/channels?`)) {+ reads+++ return reads === 1 ? Promise.resolve(envelope(["post_1"])) : new Promise<SidebarThreadEnvelope>(resolve => { release = resolve })+ }+ return original(...args)+ })+ const sidebar = await mountCanonicalHook(() => useForumSidebarThreads(serverId, null))+ await expect.poll(() => sidebar.result.current.error?.message ?? sidebar.result.current.sidebar.status).toBe("ready")+ expect(reads).toBe(1)+ act(() => { publishCommunityChannelMetadata(capturedQueryClient, { metadata: {+ id: "post_live", serverId, name: "New live post", type: "thread", parentChannelId: "forum_1", parentMessageId: "opener-post_live",+ creatorId: "u_me", archived: false, lastMessageAt: new Date().toISOString(),+ }, proof: { token: captureCommunityLiveSnapshotToken(capturedQueryClient), signal: undefined } }) })+ expect(hasCanonicalChannelNotify("post_live", "u_me")).toBe(false)+ const now = new Date().toISOString()+ const message: CommunityWsEvent = { type: "community:message.create", serverId, channelId: "post_live", parentChannelId: "forum_1",+ message: { id: "live-reply", type: "chat", authorId: "u_me", authorName: "Me", authorAvatarVersion: 0, content: "First reply", seq: 1, createdAt: now } }+ const create: CommunityWsEvent = { type: "community:channel.child_create", parentChannelId: "forum_1", parentMessageId: "opener-post_live",+ channel: { id: "post_live", name: "New live post", type: "thread", creatorId: "u_me", createdAt: now } }+ const activity: CommunityWsEvent = { type: "community:channel.child_update", parentChannelId: "forum_1", channelId: "post_live", changes: { lastMessageAt: now, messageCount: 1 } }+ const membership: CommunityWsEvent = { type: "community:channel.membership.change", relation: "notify", present: true,+ serverId, channelId: "post_live", userId: "u_me" }+ const events = signal === "membership" ? [message, activity, membership] : signal === "batch" ? [message, activity] : signal === "message" ? [message] : signal === "create" ? [create] : [activity]+ const delivery = await frame(events, `live-${signal}-${participates}`)+ await act(async () => { await capturedOnMessage!(delivery) })+ expect(getCanonicalCommunityChannels(capturedQueryClient).some(row => row.id === "post_live")).toBe(true)+ if (signal === "batch" || signal === "message") expect(getCanonicalCommunityMessages(capturedQueryClient).some(row => row.id === "live-reply")).toBe(true)+ await expect.poll(() => reads).toBe(2)+ expect(hasCanonicalChannelNotify("post_live", "u_me")).toBe(signal === "membership")+ if (signal !== "membership") expect(sidebar.result.current.threads.some(row => row.id === "post_live")).toBe(false)+ const previousWindow = capturedQueryClient.getQueryData(communityKeys.forumSidebarThreads(serverId))+ if (retires) act(() => { canonicalRegistry!.runtime.lifecycle.setState(state => ({ active: false, generation: state.generation + 1 })) })+ await act(async () => { release(envelope(participates ? ["post_1", "post_live"] : ["post_1"])) })+ if (retires) {+ await expect.poll(() => capturedQueryClient.getQueryState(communityKeys.forumSidebarThreads(serverId))?.fetchStatus).toBe("idle")+ expect(hasCanonicalChannelNotify("post_live", "u_me")).toBe(false)+ expect(capturedQueryClient.getQueryData(communityKeys.forumSidebarThreads(serverId))).toBe(previousWindow)+ return+ }+ await expect.poll(() => sidebar.result.current.threads.some(row => row.id === "post_live")).toBe(participates)+ expect(hasCanonicalChannelNotify("post_live", "u_me")).toBe(participates)+ expect(capturedQueryClient.getQueryData(communityKeys.forumSidebarThreads(serverId))).toMatchObject({ window: {+ base: participates ? expect.arrayContaining([expect.objectContaining({ id: "post_live" })]) : [expect.objectContaining({ id: "post_1" })],+ } })+ await act(async () => { await capturedOnMessage!(delivery) })+ expect(reads).toBe(2)+ })+})diff --git a/src/web/src/hooks/community/community-ws/membership-events.ts b/src/web/src/hooks/community/community-ws/membership-events.tsindex 109aeda42..e7a943bd7 100644--- a/src/web/src/hooks/community/community-ws/membership-events.ts+++ b/src/web/src/hooks/community/community-ws/membership-events.ts@@ -14,7 +14,6 @@ import { communityKeys } from "@/lib/query-keys"import { patchMemberWindows } from "@/hooks/community/use-server-members"import {- invalidateForumSidebarBaseExact,isKnownNonForumSidebarChannel,} from "@/hooks/community/use-forum-sidebar-threads"@@ -27,6 +26,7 @@ import { evictServerChannelScopes } from "./scope-eviction"import {invalidateChannelRefDirectory,+ invalidateForumSidebar,invalidateInbox,invalidateChannelRoster,invalidateInvitableFriends,@@ -92,7 +92,7 @@ export function handleChannelMembershipChange(event: CommunityChannelMembershipCinvalidateInbox(projection)invalidateServersList(projection)if (event.serverId && !isKnownNonForumSidebarChannel(queryClient, event.serverId, event.channelId)) {- void invalidateForumSidebarBaseExact(queryClient, event.serverId).catch(() => undefined)+ invalidateForumSidebar(projection, event.serverId)}if (event.relation === "notify") {if (!event.present) getAccountUnreadProjection(queryClient, event.userId).retireNotificationScope({ kind: "channel", channelId: event.channelId })diff --git a/src/web/src/hooks/community/community-ws/message-events.ts b/src/web/src/hooks/community/community-ws/message-events.tsindex 71861c22a..814b783ed 100644--- a/src/web/src/hooks/community/community-ws/message-events.ts+++ b/src/web/src/hooks/community/community-ws/message-events.ts@@ -13,6 +13,7 @@ import type {import {hasForumSidebarOwnershipEvidence,+ getForumSidebarBase,isForumSidebarParent,patchForumSidebarActivityExact,} from "@/hooks/community/use-forum-sidebar-threads"@@ -28,6 +29,7 @@ import {import {invalidateChannelMembers,+ invalidateForumSidebar,invalidateFriends,invalidatePins,} from "@/hooks/community/community-ws/invalidation-projections"@@ -121,6 +123,9 @@ export function handleMessageCreate(event.parentChannelId &&isForumSidebarParent(queryClient, event.serverId, event.parentChannelId)) {+ if (!getForumSidebarBase(queryClient, event.serverId).threads.some(thread => thread.id === event.channelId)) {+ invalidateForumSidebar(projection, event.serverId)+ }patchForumSidebarActivityExact(queryClient,event.serverId,diff --git a/src/web/src/hooks/community/community-ws/structure-tree-events.ts b/src/web/src/hooks/community/community-ws/structure-tree-events.tsindex 683f91f65..409dbbd41 100644--- a/src/web/src/hooks/community/community-ws/structure-tree-events.ts+++ b/src/web/src/hooks/community/community-ws/structure-tree-events.ts@@ -20,6 +20,7 @@ import { getCommunityDbRegistry } from "@/lib/community-db/collections"import { getCanonicalCommunityChannels, retireCommunityChannelReading } from "@/lib/community-db/sync"import {grantForumSidebarChild,+ getForumSidebarBase,hasForumSidebarOwnershipEvidence,isForumSidebarParent,patchForumSidebarActivityExact,@@ -33,6 +34,7 @@ import {import { evictServerChannelScopes } from "./scope-eviction"import {invalidateChannelMessages,+ invalidateForumSidebar,invalidateChannelRefDirectory,invalidateInvites,invalidateServerDetail,@@ -41,7 +43,9 @@ import {} from "./invalidation-projections"import { getActiveAccountUnreadProjection } from "@/hooks/community/account-unread-projection"-export function handleChildChannelCreate(event: CommunityChildChannelCreate, { projection }: StructureTreeEventContext) {+export function handleChildChannelCreate(event: CommunityChildChannelCreate, { queryClient, projection }: StructureTreeEventContext) {+ const parent = getCanonicalCommunityChannels(queryClient).find(row => row.id === event.parentChannelId && row.type === "forum")+ if (parent?.serverId) invalidateForumSidebar(projection, parent.serverId)invalidateThreads(projection, event.parentChannelId)if (event.parentMessageId) invalidateChannelMessages(projection, event.parentChannelId)}@@ -61,7 +65,7 @@ export function handleChildChannelUpdate(queryKey: communityKeys.forumTags(event.parentChannelId),})}- const sidebarServerId = getCommunityRuntime(queryClient).ui.get().currentServerId+ const sidebarServerId = getCanonicalCommunityChannels(queryClient).find(row => row.id === event.parentChannelId && row.type === "forum")?.serverIdif (sidebarServerId &&isForumSidebarParent(queryClient, sidebarServerId, event.parentChannelId)@@ -89,6 +93,9 @@ export function handleChildChannelUpdate((changes.tags ?? []).includes(FORUM_ARCHIVE_TAG),)} else if (changes.lastMessageAt) {+ if (!getForumSidebarBase(queryClient, sidebarServerId).threads.some(thread => thread.id === event.channelId)) {+ invalidateForumSidebar(projection, sidebarServerId)+ }patchForumSidebarActivityExact(queryClient,sidebarServerId,diff --git a/src/web/src/hooks/community/use-forum-sidebar-threads.dom.test.ts b/src/web/src/hooks/community/use-forum-sidebar-threads.dom.test.tsindex 295d86c84..8c214fe4b 100644--- a/src/web/src/hooks/community/use-forum-sidebar-threads.dom.test.ts+++ b/src/web/src/hooks/community/use-forum-sidebar-threads.dom.test.ts@@ -2,11 +2,15 @@ import { conversationEntryFromChannel } from "@/test/conversation-entry-fixturesimport { conversationEntryOptions } from "@/lib/community/conversation-entry"import "fake-indexeddb/auto"import { createElement, type PropsWithChildren } from "react"+import { hydrateRoot } from "react-dom/client"+import { renderToString } from "react-dom/server"import { dehydrate, hydrate, CancelledError, QueryClient, QueryClientProvider } from "@tanstack/react-query"import { beforeEach, describe, expect, it, vi } from "vitest"-import { act, renderHook, waitFor } from "@/test/react-dom-harness"+import { act, render, renderHook, waitFor } from "@/test/react-dom-harness"import { createCommunityDbRegistry, registerCommunityDbRegistry } from "@/lib/community-db/collections"-import { CommunityDbProvider, useForumSidebarProjection } from "@/lib/community-db/projections"+import { CommunityDbProvider, useForumSidebarProjection, useServerTreeProjection } from "@/lib/community-db/projections"+import { ChannelSidebarRevealBoundary } from "@/components/community/channels/channel-sidebar-tree-owner"+import { tid } from "@/lib/community/testids"import {captureCommunityLiveSnapshotToken,ingestAttentionSnapshot,@@ -23,6 +27,7 @@ import {removeCanonicalCommunityChannelMembership,setCanonicalCommunityChannelMembership,} from "@/lib/community-db/sync"+import { writeCommunityCollectionRows } from "@/lib/community-db/write"import { getCommunityDbRegistry } from "@/lib/community-db/collections"import { useChannelMetadata } from "./use-channel-metadata"import { projectForumSidebar } from "@/lib/community/forum-sidebar"@@ -47,6 +52,8 @@ import { readCommunityRestoredCollections,clearPersistedCache,createIdbPersister,PERSIST_BUSTER,+ MAX_PERSISTED_MESSAGES_PER_SCOPE,+ shouldDehydrateCommunityQuery,} from "@/lib/query-persister"const apiFetchMock = vi.hoisted(() => vi.fn())@@ -169,10 +176,10 @@ async function setup() {return { queryClient, registry, wrapper }}-function publish(queryClient: QueryClient, data = envelope()) {+function publish(queryClient: QueryClient, data = envelope(), completeWindow = false, serverId = "server-1") {const normalized = normalizeForumSidebarEnvelope(data, null)publishCommunityForumSidebar(queryClient, {- serverId: "server-1",+ serverId,channels: data.channels,openers: data.included.parentMessages,proof: {@@ -180,9 +187,48 @@ function publish(queryClient: QueryClient, data = envelope()) {signal: undefined,},})+ if (completeWindow) queryClient.setQueryData(communityKeys.forumSidebarThreads(serverId), {+ ...normalized.base, threads: [], window: {+ version: 1, accountId: "viewer", serverId,+ parents: getCanonicalCommunityChannels(queryClient).filter(row => row.serverId === serverId && row.type === "forum").map(row => row.id),+ base: normalized.base.threads.map(({ id, parentChannelId, parentMessageId }) => ({ id, parentChannelId, parentMessageId })), retained: null,+ },+ })return normalized}+async function restorePersistedSidebar(queryClient: QueryClient) {+ await clearPersistedCache("viewer")+ const persister = createIdbPersister("viewer")+ await persister.persistClient({ timestamp: Date.now(), buster: PERSIST_BUSTER, clientState: dehydrate(queryClient, { shouldDehydrateQuery: shouldDehydrateCommunityQuery }) })+ const restored = await persister.restoreClient()+ expect(restored).toBeDefined()+ const restoredClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })+ hydrate(restoredClient, restored!.clientState)+ const registry = createCommunityDbRegistry(restoredClient, "viewer")+ registry.captureRestoredCollections(readCommunityRestoredCollections(restored, "viewer"))+ await registry.preload()+ const unregister = registerCommunityDbRegistry(registry)+ cleanups.push(unregister, registry.cleanup.bind(registry), () => clearPersistedCache("viewer"))+ const wrapper = ({ children }: PropsWithChildren) => createElement(QueryClientProvider, { client: restoredClient },+ createElement(CommunityDbProvider, { registry }, children))+ return { queryClient: restoredClient, registry, wrapper }+}++function ProjectedSidebar() {+ const primary = useServerTreeProjection("server-1")+ const forum = useForumSidebarThreads("server-1", null)+ const grouped: Record<string, typeof forum.threads> = {}+ for (const thread of forum.threads) (grouped[thread.parentChannelId] ??= []).push(thread)+ if (forum.sidebar.status === "error") return createElement("div", { role: "alert" }, "Forum unavailable",+ createElement("button", { onClick: () => { void forum.refetch() } }, "Retry"))+ return createElement(ChannelSidebarRevealBoundary, {+ categories: primary?.categories ?? [], primaryReady: !!primary, forumProjectionMissing: !forum.projectionReady,+ scopeKey: "server:server-1", targetServerId: "server-1", serverId: "server-1", serverName: primary?.name ?? "",+ activeChannel: "forum-1", setActiveChannel: () => {}, isAdmin: false, noHeader: true, forumThreadsByParent: grouped,+ })+}+describe("forum sidebar canonical projection", () => {it.each(["metadata-first", "archive-first"] as const)("keeps a direct archived opener excluded after notify refresh with %s completion", async (order) => {const { queryClient, registry, wrapper } = await setup()@@ -571,23 +617,133 @@ describe("forum sidebar canonical projection", () => {it("keeps warm DB rows visible while the HTTP transport is stalled", async () => {const { queryClient, wrapper } = await setup()- publish(queryClient)+ publish(queryClient, envelope(), true)apiFetchMock.mockReturnValue(new Promise(() => {}))+ const frames: string[][] = []const rendered = renderHook(- () => useForumSidebarThreads("server-1", null),+ () => {+ const sidebar = useForumSidebarThreads("server-1", null)+ frames.push(sidebar.threads.map(({ id }) => id))+ return sidebar+ },{ wrapper },)- await waitFor(() => expect(rendered.result.current.threads).toEqual([+ expect(frames[0]).toEqual(["post-1"])+ expect(rendered.result.current.threads).toEqual([expect.objectContaining({ id: "post-1", title: "Canonical title", unread: false }),- ]))+ ])expect(rendered.result.current.projectionReady).toBe(true)- expect(rendered.result.current.fetchStatus).toBe("fetching")+ expect(rendered.result.current.fetchStatus).toBe("idle")rendered.unmount()await invalidateForumSidebarBaseExact(queryClient, "server-1")})+ it("projects complete first frames for remounted A to B to A cached servers", async () => {+ const { queryClient, registry, wrapper } = await setup()+ publish(queryClient, envelope(), true)+ ingestServerDetail(registry, {+ id: "server-2", name: "Second", discriminator: "0002", description: "", icon: null, ownerId: "viewer",+ categories: [{ id: "cat-2", name: "Second forums", channels: [{ id: "forum-2", name: "Second forum", type: "forum", active: false, unread: false }] }],+ })+ const second = envelopeFor(["post-2"])+ publish(queryClient, {+ ...second,+ channels: second.channels.map(channel => ({ ...channel, serverId: "server-2", parentChannelId: "forum-2" })),+ included: { parentMessages: second.included.parentMessages.map(message => ({ ...message, channelId: "forum-2", type: "chat" as const })) },+ }, true, "server-2")+ apiFetchMock.mockReturnValue(new Promise(() => {}))+ const frames: Array<{ serverId: string; ids: string[]; ready: boolean }> = []+ function Probe({ serverId }: { serverId: string }) {+ const sidebar = useForumSidebarThreads(serverId, null)+ frames.push({ serverId, ids: sidebar.threads.map(({ id }) => id), ready: sidebar.projectionReady })+ return null+ }+ const view = render(createElement(Probe, { key: "server-1", serverId: "server-1" }), { wrapper })+ expect(frames[0]).toEqual({ serverId: "server-1", ids: ["post-1"], ready: true })+ frames.length = 0+ view.rerender(createElement(Probe, { key: "server-2", serverId: "server-2" }))+ expect(frames[0]).toEqual({ serverId: "server-2", ids: ["post-2"], ready: true })+ frames.length = 0+ view.rerender(createElement(Probe, { key: "server-1", serverId: "server-1" }))+ expect(frames[0]).toEqual({ serverId: "server-1", ids: ["post-1"], ready: true })+ view.unmount()+ })++ it.each(["empty", "error"])("finishes the initial projection after a cold %s response", async (outcome) => {+ const { wrapper } = await setup()+ if (outcome === "empty") apiFetchMock.mockResolvedValue(envelopeFor([]))+ else apiFetchMock.mockRejectedValue(new Error("Forum read unavailable"))+ const frames: boolean[] = []+ const view = renderHook(() => {+ const sidebar = useForumSidebarThreads("server-1", null)+ frames.push(sidebar.projectionReady)+ return sidebar+ }, { wrapper })+ expect(frames[0]).toBe(false)+ await waitFor(() => expect(view.result.current.sidebar.status).toBe(outcome === "error" ? "error" : "ready"))+ expect(view.result.current.projectionReady).toBe(outcome !== "error")+ expect(view.result.current.threads).toEqual([])+ expect(view.result.current.isError).toBe(outcome === "error")+ view.unmount()+ })++ it("does not use a completed transport marker before canonical collections are ready", async () => {+ const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })+ let release!: () => void+ const registry = createCommunityDbRegistry(queryClient, "viewer", { waitForRestore: new Promise<void>((resolve) => { release = resolve }) })+ const unregister = registerCommunityDbRegistry(registry)+ cleanups.push(unregister, registry.cleanup.bind(registry))+ queryClient.setQueryData(communityKeys.forumSidebarThreads("server-1"), {+ threads: [], verifiedEpoch: 0, serverNow: new Date().toISOString(), serverClockOffsetMs: 0,+ })+ const wrapper = ({ children }: PropsWithChildren) => createElement(QueryClientProvider, { client: queryClient },+ createElement(CommunityDbProvider, { registry }, children))+ const view = renderHook(() => useForumSidebarThreads("server-1", null, false), { wrapper })+ try {+ expect(view.result.current.projectionReady).toBe(false)+ await act(async () => {+ release()+ await registry.preload()+ ingestServerDetail(registry, { id: "server-1", name: "Server", discriminator: "0001", description: "", icon: null, ownerId: "viewer", categories: [] })+ })+ await waitFor(() => expect(view.result.current.projectionReady).toBe(true))+ expect(view.result.current.threads).toEqual([])+ } finally {+ release()+ view.unmount()+ }+ })++ it("keeps SSR and hydration consistent before projecting the mounted client clock", async () => {+ const { queryClient, wrapper } = await setup()+ publish(queryClient, envelope(), true)+ apiFetchMock.mockReturnValue(new Promise(() => {}))+ function Probe() {+ const sidebar = useForumSidebarThreads("server-1", null)+ return createElement("output", null, sidebar.projectionReady ? sidebar.threads.map(({ id }) => id).join(",") : "pending")+ }+ const node = createElement(wrapper, {}, createElement(Probe))+ const html = renderToString(node)+ expect(html).toContain(">pending<")+ const host = document.createElement("div")+ host.innerHTML = html+ document.body.append(host)+ const recoverable = vi.fn()+ const now = vi.spyOn(Date, "now").mockReturnValue(Date.now() + 60_000)+ let root: ReturnType<typeof hydrateRoot> | undefined+ try {+ await act(async () => { root = hydrateRoot(host, node, { onRecoverableError: recoverable }) })+ expect(recoverable).not.toHaveBeenCalled()+ expect(host).toHaveTextContent("post-1")+ } finally {+ await act(async () => root?.unmount())+ host.remove()+ now.mockRestore()+ }+ })+it("removes a restored notify row displaced by the fresh bounded window", async () => {const { queryClient, registry, wrapper } = await setup()const restored = envelopeFor([@@ -714,7 +870,7 @@ describe("forum sidebar canonical projection", () => {.toBeDefined()})- it("keeps only request-clock data in the transport cache under a DB provider", async () => {+ it("keeps window references and request metadata without duplicated entities under a DB provider", async () => {const { queryClient, wrapper } = await setup()apiFetchMock.mockResolvedValue(envelope())const rendered = renderHook(() => useForumSidebarThreads("server-1", null), { wrapper })@@ -723,7 +879,7 @@ describe("forum sidebar canonical projection", () => {threads: unknown[]serverNow: string}>(communityKeys.forumSidebarThreads("server-1")))- .toMatchObject({ threads: [], serverNow: expect.any(String) }))+ .toMatchObject({ threads: [], serverNow: expect.any(String), window: { version: 1, base: [{ id: "post-1", parentChannelId: "forum-1", parentMessageId: "opener-1" }] } }))rendered.unmount()})@@ -1147,39 +1303,20 @@ describe("forum sidebar canonical projection", () => {})it("restores a warm persisted sidebar while HTTP is stalled", async () => {- await clearPersistedCache("viewer")const { queryClient } = await setup()- publish(queryClient)- const persister = createIdbPersister("viewer")- await persister.persistClient({- timestamp: Date.now(),- buster: PERSIST_BUSTER,- clientState: dehydrate(queryClient),- })- const restored = await persister.restoreClient()- expect(restored).toBeDefined()- const restoredClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })- hydrate(restoredClient, restored!.clientState)- const restoredRegistry = createCommunityDbRegistry(restoredClient, "viewer")- restoredRegistry.captureRestoredCollections(readCommunityRestoredCollections(restored, "viewer"))- await restoredRegistry.preload()- const unregister = registerCommunityDbRegistry(restoredRegistry)- cleanups.push(- unregister,- restoredRegistry.cleanup.bind(restoredRegistry),- () => clearPersistedCache("viewer"),- )- const wrapper = ({ children }: PropsWithChildren) => createElement(- QueryClientProvider,- { client: restoredClient },- createElement(CommunityDbProvider, { registry: restoredRegistry }, children),- )+ publish(queryClient, envelope(), true)+ const { queryClient: restoredClient, wrapper } = await restorePersistedSidebar(queryClient)apiFetchMock.mockReturnValue(new Promise(() => {}))+ const frames: string[][] = []const rendered = renderHook(- () => useForumSidebarThreads("server-1", null),+ () => {+ const sidebar = useForumSidebarThreads("server-1", null)+ frames.push(sidebar.threads.map(({ id }) => id))+ return sidebar+ },{ wrapper },)- await waitFor(() => expect(rendered.result.current.threads[0]?.id).toBe("post-1"))+ expect(frames[0]).toEqual(["post-1"])expect(rendered.result.current.fetchStatus).toBe("fetching")const route = renderHook(() => useChannelMetadata("server-1", "post-1"), { wrapper })expect(route.result.current.isVerified).toBe(false)@@ -1188,4 +1325,232 @@ describe("forum sidebar canonical projection", () => {rendered.unmount()await invalidateForumSidebarBaseExact(restoredClient, "server-1")})++ it.each(["post", "empty", "error"])("keeps a restored main-only tree hidden until its forum read settles with %s", async (outcome) => {+ const { queryClient } = await setup()+ const restored = await restorePersistedSidebar(queryClient)+ for (const name of ["channels", "channelMemberships", "messages"] as const) {+ expect(restored.registry.hasRestoredCollection(name)).toBe(true)+ }+ expect(restored.queryClient.getQueryData(communityKeys.forumSidebarThreads("server-1"))).toBeUndefined()+ let resolveForum!: (value: SidebarThreadEnvelope) => void+ let rejectForum!: (error: Error) => void+ let settled = false+ apiFetchMock.mockReturnValue(new Promise<SidebarThreadEnvelope>((resolve, reject) => { resolveForum = resolve; rejectForum = reject }))+ const view = render(createElement(ProjectedSidebar), { wrapper: restored.wrapper })+ try {+ await waitFor(() => expect(apiFetchMock).toHaveBeenCalledOnce())+ expect(view.getByTestId(tid.channelSidebarPending("server-1"))).toBeInTheDocument()+ expect(view.queryByTestId(tid.channelRow("forum-1"))).toBeNull()+ await act(async () => {+ settled = true+ if (outcome === "error") rejectForum(new Error("Forum unavailable"))+ else resolveForum(outcome === "post" ? envelope() : envelopeFor([]))+ })+ await waitFor(() => expect(view.queryByTestId(tid.channelSidebarPending("server-1"))).toBeNull())+ if (outcome === "error") {+ expect(view.getByRole("alert")).toHaveTextContent("Forum unavailable")+ expect(view.queryByTestId(tid.channelRow("forum-1"))).toBeNull()+ } else expect(view.getByTestId(tid.channelRow("forum-1"))).toBeInTheDocument()+ if (outcome === "post") expect(view.getByTestId(tid.forumSidebarThread("post-1"))).toBeInTheDocument()+ else expect(view.queryByTestId(tid.forumSidebarThread("post-1"))).toBeNull()+ expect(restored.queryClient.getQueryState(communityKeys.forumSidebarThreads("server-1"))?.status)+ .toBe(outcome === "error" ? "error" : "success")+ } finally {+ if (!settled) await act(async () => { resolveForum(envelopeFor([])) })+ view.unmount()+ }+ })++ it("reveals a completed empty warm read on the first remount frame", async () => {+ const { wrapper } = await setup()+ apiFetchMock.mockResolvedValue(envelopeFor([]))+ const first = renderHook(() => useForumSidebarThreads("server-1", null), { wrapper })+ await waitFor(() => expect(first.result.current.isSuccess).toBe(true))+ first.unmount()+ apiFetchMock.mockClear()+ const frames: boolean[] = []+ const second = renderHook(() => {+ const forum = useForumSidebarThreads("server-1", null)+ frames.push(forum.projectionReady)+ return forum+ }, { wrapper })+ expect(frames[0]).toBe(true)+ expect(second.result.current.threads).toEqual([])+ expect(apiFetchMock).not.toHaveBeenCalled()+ second.unmount()+ })+ it.each(["primary-first", "forum-first"])("reveals one complete target with %s source completion", async order => {+ const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })+ const registry = createCommunityDbRegistry(queryClient, "viewer")+ await registry.preload()+ const unregister = registerCommunityDbRegistry(registry)+ cleanups.push(unregister, registry.cleanup.bind(registry))+ const wrapper = ({ children }: PropsWithChildren) => createElement(QueryClientProvider, { client: queryClient }, createElement(CommunityDbProvider, { registry }, children))+ let release!: (value: SidebarThreadEnvelope) => void+ apiFetchMock.mockReturnValue(new Promise<SidebarThreadEnvelope>(resolve => { release = resolve }))+ const view = render(createElement(ProjectedSidebar), { wrapper })+ await waitFor(() => expect(apiFetchMock).toHaveBeenCalledOnce())+ const publishPrimary = () => ingestServerDetail(registry, { id: "server-1", name: "Server", discriminator: "0001", description: "", icon: null, ownerId: "viewer",+ categories: [{ id: "cat-1", name: "Forum", channels: [{ id: "forum-1", name: "Forum", type: "forum", active: false, unread: false }] }] })+ if (order === "primary-first") act(publishPrimary)+ else await act(async () => { release(envelope()) })+ expect(view.getByTestId(tid.channelSidebarPending("server-1"))).toBeVisible()+ expect(view.queryByTestId(tid.channelRow("forum-1"))).toBeNull()+ expect(view.queryByTestId(tid.forumSidebarThread("post-1"))).toBeNull()+ if (order === "primary-first") await act(async () => { release(envelope()) })+ else act(publishPrimary)+ await waitFor(() => expect(view.queryByTestId(tid.channelSidebarPending("server-1"))).toBeNull())+ expect(view.getByTestId(tid.channelRow("forum-1"))).toBeVisible()+ expect(view.getByTestId(tid.forumSidebarThread("post-1"))).toBeVisible()+ view.unmount()+ })++ it("ends an incomplete successful response as one error and accepts an explicit retry", async () => {+ const owner = await setup()+ apiFetchMock.mockResolvedValue({ ...envelope(), included: { parentMessages: [] } })+ const view = renderHook(() => useForumSidebarThreads("server-1", null), { wrapper: owner.wrapper })+ await waitFor(() => expect(view.result.current.sidebar.status).toBe("error"))+ expect(apiFetchMock).toHaveBeenCalledOnce()+ expect(owner.queryClient.getQueryData(communityKeys.forumSidebarThreads("server-1"))).toBeUndefined()+ apiFetchMock.mockResolvedValue(envelope())+ await act(async () => { await view.result.current.refetch() })+ await waitFor(() => expect(view.result.current.sidebar.status).toBe("ready"))+ expect(apiFetchMock).toHaveBeenCalledTimes(2)+ view.unmount()+ })++ it.each(["memory", "restored"])("does not treat a single cached post as a complete %s window", async (kind) => {+ const owner = await setup()+ publish(owner.queryClient)+ const target = kind === "restored" ? await restorePersistedSidebar(owner.queryClient) : owner+ let release!: (value: SidebarThreadEnvelope) => void+ apiFetchMock.mockReturnValue(new Promise<SidebarThreadEnvelope>(resolve => { release = resolve }))+ const view = render(createElement(ProjectedSidebar), { wrapper: target.wrapper })+ await waitFor(() => expect(apiFetchMock).toHaveBeenCalledOnce())+ expect(view.getByTestId(tid.channelSidebarPending("server-1"))).toBeVisible()+ expect(view.queryByTestId(tid.channelRow("forum-1"))).toBeNull()+ expect(view.queryByTestId(tid.forumSidebarThread("post-1"))).toBeNull()+ await act(async () => { release(envelopeFor(["post-1", "post-2"])) })+ await waitFor(() => expect(view.queryByTestId(tid.channelSidebarPending("server-1"))).toBeNull())+ expect(view.getByTestId(tid.channelRow("forum-1"))).toBeVisible()+ expect(view.getByTestId(tid.forumSidebarThread("post-1"))).toBeVisible()+ expect(view.getByTestId(tid.forumSidebarThread("post-2"))).toBeVisible()+ view.unmount()+ })++ it("restores a completed empty window on its first frame while revalidating", async () => {+ const owner = await setup()+ apiFetchMock.mockResolvedValue(envelopeFor([]))+ const first = renderHook(() => useForumSidebarThreads("server-1", null), { wrapper: owner.wrapper })+ await waitFor(() => expect(first.result.current.sidebar.status).toBe("ready"))+ first.unmount()+ const target = await restorePersistedSidebar(owner.queryClient)+ apiFetchMock.mockReturnValue(new Promise(() => {}))+ const frames: string[] = []+ const view = renderHook(() => {+ const result = useForumSidebarThreads("server-1", null)+ frames.push(result.sidebar.status)+ return result+ }, { wrapper: target.wrapper })+ expect(frames[0]).toBe("ready")+ expect(view.result.current.threads).toEqual([])+ expect(view.result.current.fetchStatus).toBe("fetching")+ view.unmount()+ })++ it("persists the last successful window after a refresh failure without restoring error or access proof", async () => {+ const owner = await setup()+ apiFetchMock.mockResolvedValue(envelope())+ const first = renderHook(() => useForumSidebarThreads("server-1", null), { wrapper: owner.wrapper })+ await waitFor(() => expect(first.result.current.sidebar.status).toBe("ready"))+ apiFetchMock.mockRejectedValue(new Error("Refresh unavailable"))+ await act(async () => { await first.result.current.refetch() })+ expect(owner.queryClient.getQueryState(communityKeys.forumSidebarThreads("server-1"))?.status).toBe("error")+ await waitFor(() => expect(first.result.current.isError).toBe(true))+ expect(first.result.current.sidebar.status).toBe("ready")+ first.unmount()+ const target = await restorePersistedSidebar(owner.queryClient)+ expect(target.queryClient.getQueryState(communityKeys.forumSidebarThreads("server-1"))).toMatchObject({ status: "success", error: null, data: { verifiedEpoch: -1, threads: [] } })+ apiFetchMock.mockReturnValue(new Promise(() => {}))+ const view = renderHook(() => useForumSidebarThreads("server-1", null), { wrapper: target.wrapper })+ expect(view.result.current.sidebar.status).toBe("ready")+ expect(view.result.current.threads.map(row => row.id)).toEqual(["post-1"])+ view.unmount()+ })++ it("rejects the window after the real message budget prunes its opener and starts a fresh read", async () => {+ const owner = await setup()+ publish(owner.queryClient, envelope(), true)+ ingestMessages(owner.registry, "forum-1", Array.from({ length: MAX_PERSISTED_MESSAGES_PER_SCOPE }, (_, index) => ({+ id: `newer-${index}`, type: "chat" as const, content: "Newer", seq: index + 2, createdAt: new Date().toISOString(),+ })))+ const target = await restorePersistedSidebar(owner.queryClient)+ expect(target.registry.collections.messages.get("opener-1")).toBeUndefined()+ expect(target.queryClient.getQueryData(communityKeys.forumSidebarThreads("server-1"))).toBeUndefined()+ let release!: (value: SidebarThreadEnvelope) => void+ apiFetchMock.mockReturnValue(new Promise<SidebarThreadEnvelope>(resolve => { release = resolve }))+ const view = render(createElement(ProjectedSidebar), { wrapper: target.wrapper })+ await waitFor(() => expect(apiFetchMock).toHaveBeenCalledOnce())+ expect(view.getByTestId(tid.channelSidebarPending("server-1"))).toBeVisible()+ await act(async () => { release(envelope()) })+ await waitFor(() => expect(view.getByTestId(tid.forumSidebarThread("post-1"))).toBeVisible())+ view.unmount()+ })++ it.each(["opener", "legacy-result"])("actively repairs a warm window after local %s loss without a retirement invalidation", async missing => {+ const owner = await setup()+ publish(owner.queryClient, envelope(), true)+ if (missing === "legacy-result") owner.queryClient.setQueryData(communityKeys.forumSidebarThreads("server-1"), {+ threads: [], serverNow: new Date().toISOString(), serverClockOffsetMs: 0, verifiedEpoch: -1,+ })+ let release!: (value: SidebarThreadEnvelope) => void+ apiFetchMock.mockReturnValue(new Promise<SidebarThreadEnvelope>(resolve => { release = resolve }))+ const view = renderHook(() => useForumSidebarThreads("server-1", null), { wrapper: owner.wrapper })+ if (missing === "opener") {+ expect(view.result.current.sidebar.status).toBe("ready")+ expect(apiFetchMock).not.toHaveBeenCalled()+ await act(async () => { await writeCommunityCollectionRows(owner.registry, "messages", [], row => row.id) })+ }+ await waitFor(() => expect(apiFetchMock).toHaveBeenCalledOnce())+ expect(view.result.current.sidebar.status).toBe("pending")+ expect(new URL(String(apiFetchMock.mock.calls[0]![0]), "http://localhost").pathname).toBe("/api/community/servers/server-1/channels")+ await act(async () => { release(envelope()) })+ await waitFor(() => expect(view.result.current.sidebar.status).toBe("ready"))+ expect(view.result.current.threads[0]).toMatchObject({ id: "post-1", title: "Canonical title" })+ view.unmount()+ })++ it("actively rereads an Infinity window when a referenced canonical post retires", async () => {+ const owner = await setup()+ publish(owner.queryClient, envelope(), true)+ let release!: (value: SidebarThreadEnvelope) => void+ apiFetchMock.mockReturnValue(new Promise<SidebarThreadEnvelope>(resolve => { release = resolve }))+ const view = renderHook(() => useForumSidebarThreads("server-1", null), { wrapper: owner.wrapper })+ expect(view.result.current.sidebar.status).toBe("ready")+ expect(apiFetchMock).not.toHaveBeenCalled()+ act(() => { purgeCommunityChannel(owner.registry, "post-1") })+ await waitFor(() => expect(apiFetchMock).toHaveBeenCalledOnce())+ await act(async () => { release(envelopeFor([])) })+ await waitFor(() => expect(view.result.current.sidebar.status).toBe("ready"))+ expect(view.result.current.threads).toEqual([])+ expect(owner.registry.collections.channels.has("post-1")).toBe(false)+ view.unmount()+ })++ it("records the same base owner for grant and reconnect while keeping retained separate", async () => {+ const { queryClient } = await setup()+ const base = envelopeFor(["base-post"])+ const extra = envelopeFor(["retained-post"])+ apiFetchMock.mockResolvedValue({ ...base, canonicalChannels: base.channels, retainedChannel: extra.channels[0], retainedDisposition: "eligible",+ included: { parentMessages: [...base.included.parentMessages, ...extra.included.parentMessages] } })+ await grantForumSidebarChild(queryClient, "server-1", "retained-post")+ expect(queryClient.getQueryData(communityKeys.forumSidebarThreads("server-1"))).toMatchObject({ threads: [], window: {+ base: [{ id: "base-post" }], retained: { id: "retained-post", disposition: "eligible", reference: { id: "retained-post" } },+ } })+ apiFetchMock.mockResolvedValue(envelopeFor([]))+ await reconcileForumSidebarNotifyMemberships(queryClient, "server-1")+ expect(queryClient.getQueryData(communityKeys.forumSidebarThreads("server-1"))).toMatchObject({ threads: [], window: { base: [], retained: null } })+ })+})diff --git a/src/web/src/hooks/community/use-forum-sidebar-threads.ts b/src/web/src/hooks/community/use-forum-sidebar-threads.tsindex 83784480c..2dcdfb3f1 100644--- a/src/web/src/hooks/community/use-forum-sidebar-threads.ts+++ b/src/web/src/hooks/community/use-forum-sidebar-threads.ts@@ -1,6 +1,6 @@"use client"-import { useAtom,useCreateAtom } from "@tanstack/react-store"-import { useTrustedRestoredForumProjection } from "@/lib/community-db/projections"+import { useHydratedClient } from "@/hooks/use-hydrated-client"+import { useMountedClock } from "@/hooks/use-mounted-clock"import { getCommunityRuntime } from "@/stores/community/runtime"@@ -10,10 +10,11 @@ import { type CommunityChannelIdentity, normalizeCommunityChannelIdentity } fromimport { apiFetch } from "@/lib/api/client"import { communityRequestOptions } from "@/lib/community/account-cache-lifecycle"import { communityKeys } from "@/lib/query-keys"+import { forumSidebarWindowComplete, readForumSidebarWindowResult, type ForumSidebarWindow } from "@/lib/community/forum-sidebar-window"import { useCommunityWsStore } from "@/stores/community/ws"import {useAttentionScopes,-useForumSidebarProjection,+useServerSidebarProjection,} from "@/lib/community-db/projections"import { getCommunityDbRegistry } from "@/lib/community-db/collections"import {@@ -56,6 +57,7 @@ export type ForumSidebarQueryData = {verifiedEpoch: numberserverNow: stringserverClockOffsetMs: number+ window?: ForumSidebarWindow}export type ChildChannelMeta = Omit<CommunityChannelIdentity, "serverId" | "name" | "parentChannelId" | "parentMessageId" | "createdAt" | "lastMessageAt"> & { [Field in "serverId" | "name" | "parentChannelId" | "parentMessageId"]: NonNullable<CommunityChannelIdentity[Field]> } & {@@ -138,7 +140,9 @@ export function normalizeForumSidebarEnvelope(}const retainedChannel = retainId && envelope.retainedChannel?.id === retainId? envelope.retainedChannel- : null+ : retainId && envelope.retainedDisposition == null+ ? canonicalChannels.find(channel => channel.id === retainId) ?? null+ : nullconst retained = retainedChannel? projectForumSidebarThreads({ ...envelope, channels: [retainedChannel] })[0] ?? null: null@@ -207,6 +211,28 @@ function publishNormalizedForumSidebar(: null,proof: { token, signal },})+ const reconciliation = reconcileForumSidebarNotifyMembershipsFromBase(queryClient, serverId, normalized.base, { token, signal },+ normalized.retainedDisposition === "eligible" ? normalized.retained?.id ?? null : null)+ const reference = ({ id, parentChannelId, parentMessageId }: ForumSidebarThread) => ({ id, parentChannelId, parentMessageId })+ const result = {+ ...normalized.base, threads: [], verifiedEpoch: token.accessEpoch,+ window: {+ version: 1 as const, accountId: token.viewerId!, serverId,+ parents: [...new Set([...getCanonicalCommunityChannels(queryClient).filter(row => row.serverId === serverId && row.type === "forum").map(row => row.id), ...normalized.channels.flatMap(row => row.parentChannelId ? [row.parentChannelId] : [])])],+ base: normalized.base.threads.map(reference),+ retained: retainId ? normalized.retainedDisposition === "eligible" && normalized.retained+ ? { id: retainId, disposition: "eligible" as const, reference: reference(normalized.retained) }+ : { id: retainId, disposition: normalized.retainedDisposition === "opener-archived" ? "opener-archived" as const : "genuine-negative" as const }+ : null,+ },+ }+ const registry = getCommunityDbRegistry(queryClient)!+ if (!readForumSidebarWindowResult(result) || registry.collections.servers.get(serverId)?.detailComplete+ && !forumSidebarWindowComplete(result.window, {+ servers: [...registry.collections.servers.values()], channels: getCanonicalCommunityChannels(queryClient),+ channelMemberships: getCanonicalCommunityChannelMemberships(queryClient), messages: getCanonicalCommunityMessages(queryClient),+ }, registry.accountId, serverId, retainId, Date.now() + result.serverClockOffsetMs)) throw new Error("Incomplete forum sidebar window")+ return { data: result, reconciliation }}function canonicalSidebarBase(queryClient: QueryClient, serverId: string) {@@ -327,9 +353,9 @@ async function fetchForumSidebarBaseExact(const unreadProjection = getActiveAccountUnreadProjection(queryClient)const confirmation = unreadProjection.beginAccessConfirmation()const token = captureCommunityLiveSnapshotToken(queryClient)- const requestEpoch = getCommunityRuntime(queryClient).ws.get().accessEpochlet normalized: NormalizedForumSidebarEnvelope | undefinedlet proof: CommunityFreshQueryProof | undefined+ let reconciliation: { removedIds: string[] } | undefinedawait queryClient.query({queryKey,staleTime: 0,@@ -337,7 +363,7 @@ async function fetchForumSidebarBaseExact(normalized = await fetchForumSidebar(queryClient, serverId, null, signal, token)if (signal.aborted) throw new DOMException("Aborted", "AbortError")proof = { token, signal }- publishNormalizedForumSidebar(+ const result = publishNormalizedForumSidebar(queryClient,serverId,normalized,@@ -352,16 +378,13 @@ async function fetchForumSidebarBaseExact(})),confirmation,)- return {- ...normalized.base,- threads: [],- verifiedEpoch: requestEpoch,- }+ reconciliation = result.reconciliation+ return result.data},select: undefined,})if (!normalized || !proof) throw new Error("Forum sidebar base fetch did not settle")- return { normalized, proof }+ return { normalized, proof, reconciliation: reconciliation! }}/**@@ -380,13 +403,8 @@ export async function reconcileForumSidebarNotifyMemberships(// One authoritative query-cache fetch both refreshes active observers and// supplies the bounded negative proof. Avoid invalidating into a first// active refetch and then issuing a second direct request.- const { normalized, proof } = await fetchForumSidebarBaseExact(queryClient, serverId)- return reconcileForumSidebarNotifyMembershipsFromBase(- queryClient,- serverId,- normalized.base,- proof,- )+ const { reconciliation } = await fetchForumSidebarBaseExact(queryClient, serverId)+ return reconciliation}function reconcileForumSidebarNotifyMembershipsFromBase(@@ -469,7 +487,8 @@ export async function grantForumSidebarChild(queryClient: QueryClient, serverId:const unreadProjection = getActiveAccountUnreadProjection(queryClient)const confirmation = unreadProjection.beginAccessConfirmation()const normalized = await fetchForumSidebar(queryClient, serverId, childId, signal, token)- publishNormalizedForumSidebar(queryClient, serverId, normalized, childId, signal, token)+ const result = publishNormalizedForumSidebar(queryClient, serverId, normalized, childId, signal, token)+ queryClient.setQueryData(communityKeys.forumSidebarThreads(serverId), result.data)if (hasForumSidebarThread(normalized.base, childId)|| normalized.retainedDisposition === "eligible" && normalized.retained?.id === childId) {unreadProjection.confirmAccessScopes([{ kind: "channel", channelId: childId }], confirmation)@@ -504,7 +523,6 @@ export function useForumSidebarThreads(retainId: string | null,enabled = true,) {- const restoredForumProjection = useTrustedRestoredForumProjection()const queryClient = useQueryClient()const accessEpoch = useCommunityWsStore((state) => state.accessEpoch)const unreadProjection = useMemo(@@ -518,26 +536,9 @@ export function useForumSidebarThreads(queryFn: async ({ signal }) => {const token = captureCommunityLiveSnapshotToken(queryClient)const confirmation = unreadProjection.beginAccessConfirmation()- const requestEpoch = getCommunityRuntime(queryClient).ws.get().accessEpochconst normalized = await fetchForumSidebar(queryClient, serverId, retainId, signal, token)if (signal.aborted) throw new DOMException("Aborted", "AbortError")- publishNormalizedForumSidebar(- queryClient,- serverId,- normalized,- retainId,- signal,- token,- )- reconcileForumSidebarNotifyMembershipsFromBase(- queryClient,- serverId,- normalized.base,- { token, signal },- normalized.retainedDisposition === "eligible"- ? normalized.retained?.id ?? null- : null,- )+ const result = publishNormalizedForumSidebar(queryClient, serverId, normalized, retainId, signal, token)unreadProjection.confirmAccessScopes([...normalized.base.threads,@@ -547,11 +548,7 @@ export function useForumSidebarThreads(].map((thread) => ({ kind: "channel" as const, channelId: thread.id })),confirmation,)- return {- ...normalized.base,- threads: [],- verifiedEpoch: requestEpoch,- }+ return result.data},})const previousRetainId = useRef(retainId)@@ -561,15 +558,18 @@ export function useForumSidebarThreads(void invalidateForumSidebarBaseExact(queryClient, serverId)}, [queryClient, retainId, serverId])- const [clockNowMs, setClockNowMs] = useAtom(useCreateAtom<number | null>(null))+ const hydratedClient = useHydratedClient()+ const [clockNowMs, setClockNowMs] = useMountedClock()+ const serverNowMs = hydratedClient+ ? clockNowMs + (query.data?.serverClockOffsetMs ?? 0)+ : null+ const result = useMemo(() => readForumSidebarWindowResult(query.data), [query.data])+ const sidebar = useServerSidebarProjection(serverId, retainId, serverNowMs, result?.window, query.isError)+ const canonical = sidebar.projectionuseEffect(() => {- const timeout = globalThis.setTimeout(() => setClockNowMs(Date.now()), 0)- return () => globalThis.clearTimeout(timeout)- }, [setClockNowMs])- const serverNowMs = clockNowMs === null- ? null- : clockNowMs + (query.data?.serverClockOffsetMs ?? 0)- const canonical = useForumSidebarProjection(serverId, retainId, serverNowMs)+ if (!enabled || !(sidebar.needsRead || query.data !== undefined && !result && sidebar.status === "pending") || query.isFetching || query.isError) return+ void invalidateForumSidebarBaseExact(queryClient, serverId)+ }, [enabled, sidebar.needsRead, sidebar.status, result, query.data, query.isFetching, query.isError, queryClient, serverId])const attentionScopes = useAttentionScopes()const projection = useMemo(() => {const structuralProjection = canonical ?? { threads: [], parentUnread: {} }@@ -613,10 +613,8 @@ export function useForumSidebarThreads(...query,threads: projection.threads,parentUnread: projection.parentUnread,- projectionReady: query.isError || (- clockNowMs !== null- && (query.data !== undefined || restoredForumProjection || (canonical?.threads.length ?? 0) > 0)- ),+ projectionReady: sidebar.status === "ready",+ sidebar,verifiedEpoch: accessEpoch,}}diff --git a/src/web/src/hooks/use-hydrated-client.ts b/src/web/src/hooks/use-hydrated-client.tsnew file mode 100644index 000000000..0d38ba02e--- /dev/null+++ b/src/web/src/hooks/use-hydrated-client.ts@@ -0,0 +1,9 @@+"use client"++import { useSyncExternalStore } from "react"++const subscribe = () => () => {}++export function useHydratedClient() {+ return useSyncExternalStore(subscribe, () => true, () => false)+}diff --git a/src/web/src/lib/community-db/projections-unowned.dom.test.ts b/src/web/src/lib/community-db/projections-unowned.dom.test.tsindex 828a2c574..aed5197f7 100644--- a/src/web/src/lib/community-db/projections-unowned.dom.test.ts+++ b/src/web/src/lib/community-db/projections-unowned.dom.test.ts@@ -4,7 +4,7 @@ import { configureTelemetry, retireTelemetry } from "@/lib/observability/telemetvi.mock("@tanstack/react-db", async importOriginal => {const real = await importOriginal<typeof import("@tanstack/react-db")>()- return { ...real, useLiveQuery: () => ({ data: [{ id: "server-a", name: "Unowned snapshot", detailComplete: true, ownerId: "viewer" }] }) }+ return { ...real, useLiveQuery: () => ({ isReady: true, data: [{ id: "server-a", name: "Unowned snapshot", detailComplete: true, ownerId: "viewer" }] }) }})it("does not attribute an upstream cached tree snapshot to an absent community owner", async () => {const { useServerTreeProjection } = await import("./projections")diff --git a/src/web/src/lib/community-db/projections.ts b/src/web/src/lib/community-db/projections.tsindex 850f2b160..5c576abb1 100644--- a/src/web/src/lib/community-db/projections.ts+++ b/src/web/src/lib/community-db/projections.ts@@ -1,5 +1,7 @@"use client"+import { forumSidebarWindowComplete, type ForumSidebarWindow } from "@/lib/community/forum-sidebar-window"+import { createContext, createElement, useContext, useMemo, type Context, type ReactNode } from "react"import { ApplicationOwnerProvider, createApplicationOwner } from "@/lib/application-owner"import { DbProvider, and, eq, inArray, useLiveQuery as useNativeLiveQuery, type WhereCallback, type ContextFromSource } from "@tanstack/react-db"@@ -68,11 +70,6 @@ export function useTrustedRestoredPrimary() {return useSelector(registry?.restoration ?? absentRestoration, (state) => state.names.has("categories") && state.names.has("channels"))}-export function useTrustedRestoredForumProjection() {- const registry = useOptionalCommunityDbRegistry()- return useSelector(registry?.restoration ?? absentRestoration, (state) => ["channels", "channelMemberships", "messages"].every((name) => state.names.has(name)))-}-export function CommunityDbProvider({registry,children,@@ -110,9 +107,6 @@ function useCollectionRows<N extends CommunityCollectionName>(name: N, where?: Cfunction useServerRows(serverId?: string) {return useCollectionRows("servers", ({ row }) => serverId === undefined ? eq(1, 1) : eq(row.id, serverId))}-function useCategoryRows(serverId?: string) {- return useCollectionRows("categories", ({ row }) => serverId === undefined ? eq(1, 1) : eq(row.serverId, serverId))-}function useServerMembershipRows() { return useCollectionRows("serverMemberships") }function useFolderRows() { return useCollectionRows("folders") }function useFolderItemRows() { return useCollectionRows("folderItems") }@@ -126,10 +120,6 @@ function useChannelRows(serverId?: string, type?: ChannelRow["type"]) {function useChannelMembershipRows(channelIds?: string[]) {return useCollectionRows("channelMemberships", ({ row }) => channelIds === undefined ? eq(1, 1) : inArray(row.channelId, channelIds))}-function useMessageRowsById(messageIds: string[]) {- return useCollectionRows("messages", ({ row }) => inArray(row.id, messageIds))-}-export function useServerRailProjection() {const rows = {registry: useOptionalCommunityDbRegistry(),@@ -205,13 +195,13 @@ export function useServerRailProjection() {}export function useServerTreeProjection(serverId: string | null) {- const rows = {- servers: useServerRows(serverId ?? ""),- categories: useCategoryRows(serverId ?? ""),- channels: useChannelRows(serverId ?? ""),- }+ const servers = useCollectionQuery("servers", ({ row }) => eq(row.id, serverId ?? ""))+ const categories = useCollectionQuery("categories", ({ row }) => eq(row.serverId, serverId ?? ""))+ const channels = useCollectionQuery("channels", ({ row }) => eq(row.serverId, serverId ?? ""))+ const ready = servers.isReady && categories.isReady && channels.isReady+ const rows = { servers: servers.data, categories: categories.data, channels: channels.data }return useMemo(() => {- if (!serverId || !rows.servers || !rows.categories || !rows.channels) return undefined+ if (!ready || !serverId || !rows.servers || !rows.categories || !rows.channels) return undefinedconst server = rows.servers.find((candidate) => candidate.id === serverId)if (!server?.detailComplete) return undefinedconst channels = rows.channels.filter((channel) => (@@ -255,7 +245,7 @@ export function useServerTreeProjection(serverId: string | null) {ownerId: server.ownerId, categories,}return view- }, [rows.servers, rows.categories, rows.channels, serverId])+ }, [ready, rows.servers, rows.categories, rows.channels, serverId])}export function useDmProjection() {@@ -494,30 +484,40 @@ export function useChannelRefDirectoryProjection(): ChannelRefDirectory | undefi}, [rows.channels, rows.servers])}-export function useForumSidebarProjection(- serverId: string,- retainId: string | null,- serverNowMs: number | null,+function useForumSidebarRows(serverId: string) {+ const serverProjection = useCollectionQuery("servers", ({ row }) => eq(row.id, serverId))+ const channelProjection = useCollectionQuery("channels", ({ row }) => eq(row.serverId, serverId))+ const channels = channelProjection.data+ const channelIds = useMemo(() => (channels ?? []).map(row => row.id), [channels])+ const membershipProjection = useCollectionQuery("channelMemberships", ({ row }) => inArray(row.channelId, channelIds))+ const openerIds = useMemo(() => (channels ?? []).flatMap(row => row.parentMessageId ? [row.parentMessageId] : []), [channels])+ const messageProjection = useCollectionQuery("messages", ({ row }) => inArray(row.id, openerIds))+ const ready = serverProjection.isReady && channelProjection.isReady && membershipProjection.isReady && messageProjection.isReady+ return { registry: channelProjection.registry, ready, servers: serverProjection.data, channels,+ channelMemberships: membershipProjection.data, messages: messageProjection.data }+}++export function useForumSidebarProjection(serverId: string, retainId: string | null, serverNowMs: number | null) {+ const rows = useForumSidebarRows(serverId)+ return useMemo(() => {+ if (serverNowMs === null || !rows.ready || !rows.registry || !rows.channels || !rows.channelMemberships || !rows.messages) return undefined+ return projectForumSidebar(rows.channels, rows.channelMemberships, rows.messages, rows.registry.accountId, serverId, retainId, serverNowMs)+ }, [serverNowMs, rows.ready, rows.registry, rows.channels, rows.channelMemberships, rows.messages, serverId, retainId])+}++export function useServerSidebarProjection(+ serverId: string, retainId: string | null, serverNowMs: number | null, window: ForumSidebarWindow | undefined, failed: boolean,) {- const registry = useOptionalCommunityDbRegistry()- const channels = useChannelRows(serverId)- const channelIds = useMemo(() => (channels ?? []).map((channel) => channel.id), [channels])- const channelMemberships = useChannelMembershipRows(channelIds)- const openerIds = useMemo(() => (channels ?? []).flatMap((channel) => (- channel.parentMessageId ? [channel.parentMessageId] : []- )), [channels])- const messages = useMessageRowsById(openerIds)- const rows = { registry, channels, channelMemberships, messages }+ const server = useServerTreeProjection(serverId)+ const { ready, registry, servers, channels, channelMemberships, messages } = useForumSidebarRows(serverId)return useMemo(() => {- if (- serverNowMs === null- || !rows.registry- || !rows.channels- || !rows.channelMemberships- || !rows.messages- ) return undefined- const { threads, parentUnread } = projectForumSidebar(rows.channels, rows.channelMemberships, rows.messages,- rows.registry.accountId, serverId, retainId, serverNowMs)- return { threads, parentUnread }- }, [serverNowMs, rows.registry, rows.channels, rows.channelMemberships, rows.messages, serverId, retainId])+ if (serverNowMs === null || !ready || !registry || !servers || !channels || !channelMemberships || !messages) {+ return { server, projection: undefined, status: failed ? "error" as const : "pending" as const, needsRead: false }+ }+ const complete = !!server && (!channels.some(row => row.type === "forum")+ || !!window && forumSidebarWindowComplete(window, { servers, channels, channelMemberships, messages }, registry.accountId, serverId, retainId, serverNowMs))+ const projection = projectForumSidebar(channels, channelMemberships, messages, registry.accountId, serverId, retainId, serverNowMs)+ return { server, projection, status: complete ? "ready" as const : failed ? "error" as const : "pending" as const,+ needsRead: !!server && !!window && !complete }+ }, [server, serverNowMs, ready, registry, servers, channels, channelMemberships, messages, window, serverId, retainId, failed])}diff --git a/src/web/src/lib/community-db/sync.ts b/src/web/src/lib/community-db/sync.tsindex a23716351..21208f323 100644--- a/src/web/src/lib/community-db/sync.ts+++ b/src/web/src/lib/community-db/sync.ts@@ -658,6 +658,7 @@ function clearChannelTransientState(exact: true,})}+ if (serverId) void registry.queryClient.invalidateQueries({ queryKey: communityKeys.forumSidebarThreads(serverId), exact: true })if (channelIds.size === 0) returnfor (const entry of registry.runtime.messageStream.get().entries.values()) {if (channelIds.has(entry.scope.id)) registry.runtime.messageStream.actions.removeScope(entry.scope)diff --git a/src/web/src/lib/community/forum-sidebar-window.ts b/src/web/src/lib/community/forum-sidebar-window.tsnew file mode 100644index 000000000..d63298e36--- /dev/null+++ b/src/web/src/lib/community/forum-sidebar-window.ts@@ -0,0 +1,54 @@+import { z } from "zod"+import { projectForumSidebar } from "./forum-sidebar"+import type { CommunityCollectionRows } from "@/lib/community-db/schema"++const referenceSchema = z.object({ id: z.string().min(1), parentChannelId: z.string().min(1), parentMessageId: z.string().min(1) })+const retainedSchema = z.discriminatedUnion("disposition", [+ z.object({ id: z.string().min(1), disposition: z.literal("eligible"), reference: referenceSchema }),+ z.object({ id: z.string().min(1), disposition: z.enum(["opener-archived", "genuine-negative"]) }),+])+const resultSchema = z.object({+ serverNow: z.string().refine(value => Number.isFinite(Date.parse(value))),+ serverClockOffsetMs: z.number(),+ window: z.object({+ version: z.literal(1), accountId: z.string().min(1), serverId: z.string().min(1),+ parents: z.array(z.string().min(1)), base: z.array(referenceSchema), retained: retainedSchema.nullable(),+ }),+})+export type ForumSidebarWindow = z.infer<typeof resultSchema>["window"]+type WindowRows = Pick<CommunityCollectionRows, "servers" | "channels" | "channelMemberships" | "messages">+type ForumSidebarWindowRows = { [N in keyof WindowRows]: readonly WindowRows[N][] }++export function isForumSidebarWindowKey(key: readonly unknown[]): boolean {+ return key.length === 4 && key[0] === "community" && key[1] === "servers" && typeof key[2] === "string" && key[3] === "forum-sidebar-base"+}++export function readForumSidebarWindowResult(data: unknown) {+ const parsed = resultSchema.safeParse(data)+ if (!parsed.success) return undefined+ const { window } = parsed.data+ const parents = new Set(window.parents)+ const ids = new Set(window.base.map(row => row.id))+ if (parents.size !== window.parents.length || ids.size !== window.base.length+ || window.base.some(row => !parents.has(row.parentChannelId))+ || window.parents.some(id => window.base.filter(row => row.parentChannelId === id).length > 5)+ || window.retained?.disposition === "eligible" && (window.retained.reference.id !== window.retained.id || !parents.has(window.retained.reference.parentChannelId))) return undefined+ return { ...parsed.data, threads: [], verifiedEpoch: -1 }+}++export function forumSidebarWindowComplete(+ window: ForumSidebarWindow, rows: ForumSidebarWindowRows, accountId: string | null, serverId: string, retainId?: string | null, serverNowMs = Date.now(),+) {+ if (window.accountId !== accountId || window.serverId !== serverId+ || !rows.servers.some(row => row.id === serverId && row.detailComplete)) return false+ const parents = rows.channels.filter(row => row.serverId === serverId && row.type === "forum")+ if (window.parents.some(id => !parents.some(row => row.id === id))) return false+ const visible = projectForumSidebar(rows.channels, rows.channelMemberships, rows.messages, accountId, serverId,+ retainId ?? (window.retained?.disposition === "eligible" ? window.retained.id : null), serverNowMs).threads+ const references = [...window.base, ...(window.retained?.disposition === "eligible" ? [window.retained.reference] : []), ...visible]+ if (!references.every(reference => rows.channels.some(row => row.id === reference.id && row.serverId === serverId+ && row.type === "thread" && row.parentChannelId === reference.parentChannelId && row.parentMessageId === reference.parentMessageId)+ && rows.messages.some(row => row.id === reference.parentMessageId && row.channelId === reference.parentChannelId)+ && rows.channelMemberships.some(row => row.channelId === reference.id && row.userId === accountId && row.relation === "notify"))) return false+ return !retainId || window.base.some(row => row.id === retainId) || window.retained?.id === retainId+}diff --git a/src/web/src/lib/query-persister.forum-window.test.ts b/src/web/src/lib/query-persister.forum-window.test.tsnew file mode 100644index 000000000..88ebb193f--- /dev/null+++ b/src/web/src/lib/query-persister.forum-window.test.ts@@ -0,0 +1,117 @@+import "fake-indexeddb/auto"+import { afterEach, describe, expect, it } from "vitest"+import { dehydrate, QueryClient } from "@tanstack/react-query"+import { communityKeys } from "@/lib/query-keys"+import { canonicalChannelMembershipRow, canonicalChannelRow, messageSchema, serverSchema } from "@/lib/community-db/schema"+import { forumSidebarWindowComplete, readForumSidebarWindowResult } from "@/lib/community/forum-sidebar-window"+import { clearPersistedCache, createIdbPersister, PERSIST_BUSTER, shouldDehydrateCommunityQuery } from "./query-persister"++const accountId = "window-viewer"+const serverId = "window-server"+const key = communityKeys.forumSidebarThreads(serverId)+const owners: QueryClient[] = []+afterEach(async () => { for (const owner of owners) owner.clear(); owners.length = 0; await clearPersistedCache(accountId) })+function setup(empty = false) {+ const client = new QueryClient({ defaultOptions: { queries: { retry: false } } })+ owners.push(client)+ const rows = {+ servers: [serverSchema.parse({ id: serverId, name: "Server", discriminator: "0001", description: "", ownerId: accountId,+ icon: null, official: false, isOwner: true, unread: false, mentions: 0, detailComplete: true })],+ channels: [canonicalChannelRow({ id: "forum", type: "forum", serverId }),+ ...empty ? [] : [canonicalChannelRow({ id: "post", type: "thread", serverId, parentChannelId: "forum", parentMessageId: "opener" })]],+ messages: empty ? [] : [messageSchema.parse({ id: "opener", channelId: "forum", type: "chat", content: "Canonical title", seq: 1 })],+ channelMemberships: empty ? [] : [canonicalChannelMembershipRow("post", accountId, "notify")],+ }+ for (const [name, data] of Object.entries(rows)) client.setQueryData(communityKeys.communityDbCollection(accountId, name), data)+ const result = {+ threads: [{ id: "duplicated-entity", title: "Must not persist" }], verifiedEpoch: 99,+ serverNow: new Date().toISOString(), serverClockOffsetMs: 0,+ window: { version: 1 as const, accountId, serverId, parents: ["forum"],+ base: empty ? [] : [{ id: "post", parentChannelId: "forum", parentMessageId: "opener" }], retained: null },+ }+ client.setQueryData(key, result)+ const snapshot = () => ({ timestamp: Date.now(), buster: PERSIST_BUSTER, clientState: dehydrate(client, { shouldDehydrateQuery: shouldDehydrateCommunityQuery }) })+ return { client, rows, result, snapshot }+}++describe("scoped forum window persistence", () => {+ it.each([false, true])("restores only a complete minimal %s window without entity copies or access proof", async empty => {+ const owner = setup(empty)+ const persister = createIdbPersister(accountId)+ await persister.persistClient(owner.snapshot())+ const restored = await persister.restoreClient()+ const state = restored!.clientState.queries.find(query => JSON.stringify(query.queryKey) === JSON.stringify(key))!.state+ expect(state).toMatchObject({ status: "success", error: null, fetchStatus: "idle", isInvalidated: true,+ data: { threads: [], verifiedEpoch: -1, window: owner.result.window } })+ expect(JSON.stringify(state.data)).not.toContain("Canonical title")+ expect(JSON.stringify(state.data)).not.toContain("Must not persist")+ expect(forumSidebarWindowComplete(readForumSidebarWindowResult(state.data)!.window, owner.rows, accountId, serverId)).toBe(true)+ })++ it.each(["messages", "channelMemberships", "parent", "server", "detail"])("rejects a descriptor with missing %s before hydrate", async missing => {+ const owner = setup()+ if (missing === "parent") owner.client.setQueryData(communityKeys.communityDbCollection(accountId, "channels"), owner.rows.channels.filter(row => row.id !== "forum"))+ else if (missing === "server") owner.client.setQueryData(communityKeys.communityDbCollection(accountId, "servers"), [])+ else if (missing === "detail") owner.client.setQueryData(communityKeys.communityDbCollection(accountId, "servers"), owner.rows.servers.map(row => ({ ...row, detailComplete: false })))+ else owner.client.setQueryData(communityKeys.communityDbCollection(accountId, missing), [])+ const persister = createIdbPersister(accountId)+ await persister.persistClient(owner.snapshot())+ expect((await persister.restoreClient())!.clientState.queries.some(query => JSON.stringify(query.queryKey) === JSON.stringify(key))).toBe(false)+ })++ it.each(["account", "server", "legacy", "version", "unbounded"])("rejects a %s window", async invalid => {+ const owner = setup()+ const result = structuredClone(owner.result)+ if (invalid === "account") result.window.accountId = "other-viewer"+ if (invalid === "server") result.window.serverId = "other-server"+ if (invalid === "legacy") Reflect.deleteProperty(result, "window")+ if (invalid === "version") Reflect.set(result.window, "version", 0)+ if (invalid === "unbounded") result.window.base = Array.from({ length: 6 }, (_, index) => ({ id: `post-${index}`, parentChannelId: "forum", parentMessageId: "opener" }))+ owner.client.setQueryData(key, result)+ const persister = createIdbPersister(accountId)+ await persister.persistClient(owner.snapshot())+ expect((await persister.restoreClient())!.clientState.queries.some(query => JSON.stringify(query.queryKey) === JSON.stringify(key))).toBe(false)+ })++ it.each([false, true])("fences a late writer's %s window after post or parent retirement", async empty => {+ const owner = setup(empty)+ const stale = createIdbPersister(accountId)+ const before = owner.snapshot()+ await stale.persistClient(before)+ const current = createIdbPersister(accountId)+ await current.retireChannels([empty ? "forum" : "post"], true)+ await stale.persistClient(before)+ expect((await current.restoreClient())!.clientState.queries.some(query => JSON.stringify(query.queryKey) === JSON.stringify(key))).toBe(false)+ })++ it("does not admit an initial error or broaden persistence for other failed resources", async () => {+ const owner = setup()+ owner.client.removeQueries({ queryKey: key, exact: true })+ await owner.client.query({ queryKey: key, queryFn: () => Promise.reject(new Error("Initial failure")) }).catch(() => undefined)+ const machines = communityKeys.machines()+ owner.client.setQueryData(machines, { machines: [] })+ await owner.client.query({ queryKey: machines, queryFn: () => Promise.reject(new Error("Machine refresh failure")), staleTime: 0 }).catch(() => undefined)+ expect(owner.snapshot().clientState.queries.some(query => JSON.stringify(query.queryKey) === JSON.stringify(key))).toBe(false)+ expect(owner.snapshot().clientState.queries.some(query => JSON.stringify(query.queryKey) === JSON.stringify(machines))).toBe(false)+ })++ it("checks a realtime visible child closure even when the last successful base was empty", async () => {+ const owner = setup(true)+ owner.client.setQueryData(communityKeys.communityDbCollection(accountId, "channels"), [+ ...owner.rows.channels, canonicalChannelRow({ id: "realtime-post", type: "thread", serverId, parentChannelId: "forum", parentMessageId: "missing-opener", lastMessageAt: new Date().toISOString() }),+ ])+ owner.client.setQueryData(communityKeys.communityDbCollection(accountId, "channelMemberships"), [canonicalChannelMembershipRow("realtime-post", accountId, "notify")])+ const persister = createIdbPersister(accountId)+ await persister.persistClient(owner.snapshot())+ expect((await persister.restoreClient())!.clientState.queries.some(query => JSON.stringify(query.queryKey) === JSON.stringify(key))).toBe(false)+ })++ it("binds retained disposition to its child while keeping the base window reusable", () => {+ const owner = setup()+ const result = readForumSidebarWindowResult(owner.result)!+ const window = { ...result.window, retained: { id: "archived-child", disposition: "opener-archived" as const } }+ expect(forumSidebarWindowComplete(window, owner.rows, accountId, serverId, "archived-child")).toBe(true)+ expect(forumSidebarWindowComplete(window, owner.rows, accountId, serverId, "other-child")).toBe(false)+ expect(forumSidebarWindowComplete(window, owner.rows, accountId, serverId, null)).toBe(true)+ })+})diff --git a/src/web/src/lib/query-persister.test.ts b/src/web/src/lib/query-persister.test.tsindex 736689556..05b02bebe 100644--- a/src/web/src/lib/query-persister.test.ts+++ b/src/web/src/lib/query-persister.test.ts@@ -70,8 +70,8 @@ describe("shouldPersistQueryKey", () => {expect(shouldPersistQueryKey(communityKeys.bots())).toBe(true)})- it("does not restore transient transport state on reload", () => {- expect(shouldPersistQueryKey(communityKeys.forumSidebarThreads("srv_1"))).toBe(false)+ it("allows the forum window resource key while excluding other transient transport", () => {+ expect(shouldPersistQueryKey(communityKeys.forumSidebarThreads("srv_1"))).toBe(true)expect(shouldPersistQueryKey(communityKeys.channelMeta("srv_1", "thread_1"))).toBe(false)expect(shouldPersistQueryKey(communityKeys.message("opener_1"))).toBe(false)expect(shouldPersistQueryKey(communityKeys.channelRefDirectory())).toBe(false)diff --git a/src/web/src/lib/query-persister.ts b/src/web/src/lib/query-persister.tsindex eef15f92b..0ff4d1ced 100644--- a/src/web/src/lib/query-persister.ts+++ b/src/web/src/lib/query-persister.ts@@ -1,3 +1,4 @@+import { forumSidebarWindowComplete, isForumSidebarWindowKey, readForumSidebarWindowResult } from "@/lib/community/forum-sidebar-window"import { messageProfileIds, type Msg } from "@/lib/community/models/message"import { clearLegacyChatCaches, getLegacyChatCacheSizeBytes } from "@/lib/legacy-chat-persistence"import { clearPublicWorkerCaches, getPublicWorkerCacheSizeBytes } from "@/lib/service-worker/public-cache-storage"@@ -39,7 +40,7 @@ function isCommunityDbCollectionKey(queryKey: readonly unknown[]): boolean {}export function shouldPersistQueryKey(queryKey: readonly unknown[]): boolean {- return isCommunityDbCollectionKey(queryKey) || isCommunityListResourceKey(queryKey)+ return isCommunityDbCollectionKey(queryKey) || isCommunityListResourceKey(queryKey) || isForumSidebarWindowKey(queryKey)}export function shouldPersistQuery(@@ -47,6 +48,12 @@ export function shouldPersistQuery(data: unknown,): boolean {return isCommunityDbCollectionKey(queryKey) || persistentCommunityListResource(queryKey, data) !== undefined+ || isForumSidebarWindowKey(queryKey) && readForumSidebarWindowResult(data)?.window.serverId === queryKey[2]+}++export function shouldDehydrateCommunityQuery(query: { queryKey: readonly unknown[]; state: { status: string; data: unknown } }) {+ return (query.state.status === "success" || isForumSidebarWindowKey(query.queryKey))+ && shouldPersistQuery(query.queryKey, query.state.data)}export type CommunityRestoredCollections = Partial<{@@ -224,6 +231,17 @@ function scrubDehydratedClient(const data = windowed[collectionName]if (data) queries.push({ ...q, state: { ...q.state, data } })}+ const retiredServerIds = new Set(rows("channels").filter(row => retired.has(row.id)).map(row => row.serverId))+ for (const q of client.clientState.queries) {+ if (!userId || !isForumSidebarWindowKey(q.queryKey)) continue+ const data = readForumSidebarWindowResult(q.state.data)+ if (!data || data.window.serverId !== q.queryKey[2] || retiredServerIds.has(data.window.serverId)+ || data.window.parents.some(id => retired.has(id))+ || [...data.window.base, ...(data.window.retained?.disposition === "eligible" ? [data.window.retained.reference] : [])].some(row => retired.has(row.id) || retired.has(row.parentChannelId))+ || !forumSidebarWindowComplete(data.window, { servers: rows("servers"), channels: retainedChannels, channelMemberships: retainedChannelMemberships, messages: retainedMessages }, userId, data.window.serverId, null, Date.now() + data.serverClockOffsetMs)) continue+ queries.push({ ...q, state: { ...q.state, data, status: "success", error: null, errorUpdatedAt: 0,+ errorUpdateCount: 0, isInvalidated: true, fetchFailureCount: 0, fetchFailureReason: null, fetchStatus: "idle", fetchMeta: null } })+ }return {...client,clientState: { ...client.clientState, queries },