Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

feat(web): load older bot activity on upward input (#953)

Generadda07ddcf8c
diff --git a/src/web/src/components/community/bots/bot-activity-modal.dom.test.ts b/src/web/src/components/community/bots/bot-activity-modal.dom.test.ts
index 639517cea..b1fe169b7 100644
--- a/src/web/src/components/community/bots/bot-activity-modal.dom.test.ts
+++ b/src/web/src/components/community/bots/bot-activity-modal.dom.test.ts
@@ -21,8 +21,10 @@ const {
createdAt: string
}>,
isLoading: false,
+ isFetching: false,
hasNextPage: false,
isFetchingNextPage: false,
+ isFetchNextPageError: false,
loadedPageCount: 1,
},
auditHook: vi.fn(),
@@ -32,6 +34,7 @@ const {
}))
let scrollDescriptor: PropertyDescriptor | undefined
let bodyHeight = 300
+let rowHeights = new Map<string, number>()
let bodyResizeObservers: Array<{ callback: ResizeObserverCallback; elements: Set<Element> }> = []
vi.mock("@/components/community/shell/community-sheet", () => ({
@@ -61,7 +64,7 @@ vi.mock("@/lib/community-db/projections", async (importOriginal) => ({ ...await
vi.mock("@/hooks/community/use-bot-audit-log", () => ({
useBotAuditLog: (botId: string | null) => {
auditHook(botId)
- return { ...auditState, fetchNextPage }
+ return { ...auditState, isFetching: auditState.isFetching || auditState.isFetchingNextPage, fetchNextPage }
},
}))
@@ -96,19 +99,21 @@ function event(id: string, createdAt: string) {
}
type ModalOptions = {
+ bot?: typeof bot
open?: boolean
onOpenChange?: (open: boolean) => void
onOpenChangeComplete?: (open: boolean) => void
}
function renderModal({
+ bot: selectedBot = bot,
open = true,
onOpenChange = vi.fn(),
onOpenChangeComplete = vi.fn(),
}: ModalOptions = {}) {
const renderer = render(
React.createElement(BotActivityModal, {
- bot,
+ bot: selectedBot,
open,
onOpenChange,
onOpenChangeComplete,
@@ -118,13 +123,14 @@ function renderModal({
}
function updateModal(renderer: ReturnType<typeof render>, {
+ bot: selectedBot = bot,
open = true,
onOpenChange = vi.fn(),
onOpenChangeComplete = vi.fn(),
}: ModalOptions = {}) {
act(() => renderer.rerender(
React.createElement(BotActivityModal, {
- bot,
+ bot: selectedBot,
open,
onOpenChange,
onOpenChangeComplete,
@@ -181,8 +187,10 @@ describe("BotActivityModal CommunitySheet contract", () => {
beforeEach(() => {
auditState.events = []
auditState.isLoading = false
+ auditState.isFetching = false
auditState.hasNextPage = false
auditState.isFetchingNextPage = false
+ auditState.isFetchNextPageError = false
auditState.loadedPageCount = 1
auditHook.mockReset()
profileHook.mockReset()
@@ -190,6 +198,7 @@ describe("BotActivityModal CommunitySheet contract", () => {
fetchNextPage.mockResolvedValue({ isError: false, data: { pages: [{ events: [] }] } })
sheetProps.current = null
bodyHeight = 300
+ rowHeights = new Map()
bodyResizeObservers = []
vi.useFakeTimers()
vi.stubGlobal("requestAnimationFrame", (callback: FrameRequestCallback) => window.setTimeout(() => callback(performance.now()), 16))
@@ -205,7 +214,10 @@ describe("BotActivityModal CommunitySheet contract", () => {
disconnect() { this.record.elements.clear() }
})
const isRoot = (node: HTMLElement) => node.dataset.testid === "activity-body"
- const rowHeight = (node: HTMLElement) => node.closest<HTMLElement>("[data-activity-row-key]")?.dataset.activityRowKey?.includes(":date:") ? 24 : 44
+ const rowHeight = (node: HTMLElement) => {
+ const row = node.closest<HTMLElement>("[data-activity-row-key]")
+ return row?.dataset.activityRowKey?.includes(":date:") ? 24 : rowHeights.get(row?.dataset.activityEventId ?? "") ?? 44
+ }
vi.spyOn(HTMLElement.prototype, "clientHeight", "get").mockImplementation(function (this: HTMLElement) { return isRoot(this) ? bodyHeight : rowHeight(this) })
vi.spyOn(HTMLElement.prototype, "offsetHeight", "get").mockImplementation(function (this: HTMLElement) { return this.clientHeight })
vi.spyOn(HTMLElement.prototype, "offsetWidth", "get").mockImplementation(() => 672)
@@ -323,12 +335,11 @@ describe("BotActivityModal CommunitySheet contract", () => {
it.each([0, 50, 100])("preserves the visible event at offset %i when a same-day older page prepends", async offset => {
auditState.events = events(30)
auditState.hasNextPage = true
+ const completePage = prepareOlderPage()
const { renderer, onOpenChange } = renderModal()
const root = scrollBody(renderer, offset)
const id = offset < 100 ? "event-0" : "event-1"
const top = eventTop(renderer, id)
- const completePage = prepareOlderPage()
- fireEvent.click(renderer.getByRole("button", { name: "Load older" }))
expect(fetchNextPage).toHaveBeenCalledOnce()
auditState.isFetchingNextPage = true
updateModal(renderer, { onOpenChange })
@@ -397,7 +408,6 @@ describe("BotActivityModal CommunitySheet contract", () => {
const completePage = prepareOlderPage()
const { renderer } = renderModal()
scrollBody(renderer, 0)
- fireEvent.click(renderer.getByRole("button", { name: "Load older" }))
auditState.isFetchingNextPage = true
updateModal(renderer)
updateModal(renderer, { open: false })
@@ -414,12 +424,11 @@ describe("BotActivityModal CommunitySheet contract", () => {
it.each([0, 50, 150])("keeps the event at offset %i when an older day and its divider prepend", async offset => {
auditState.events = events(30)
auditState.hasNextPage = true
+ const completePage = prepareOlderPage()
const { renderer } = renderModal()
scrollBody(renderer, offset)
const id = offset < 100 ? "event-0" : "event-2"
const top = eventTop(renderer, id)
- const completePage = prepareOlderPage()
- fireEvent.click(renderer.getByRole("button", { name: "Load older" }))
auditState.isFetchingNextPage = true
updateModal(renderer)
auditState.events = [...auditState.events, event("previous-day", "2026-08-26T12:00:00.000Z")]
@@ -443,10 +452,9 @@ describe("BotActivityModal CommunitySheet contract", () => {
it("does not restore an old page anchor after the reader takes over", async () => {
auditState.events = events(30)
auditState.hasNextPage = true
+ const completePage = prepareOlderPage()
const { renderer } = renderModal()
scrollBody(renderer, 0)
- const completePage = prepareOlderPage()
- fireEvent.click(renderer.getByRole("button", { name: "Load older" }))
auditState.isFetchingNextPage = true
updateModal(renderer)
scrollBody(renderer, 600)
@@ -463,8 +471,12 @@ describe("BotActivityModal CommunitySheet contract", () => {
auditState.hasNextPage = true
fetchNextPage.mockResolvedValue({ isError: false, data: { pages: [{ events: auditState.events }, { events: [] }] } })
const { renderer } = renderModal()
- const root = scrollBody(renderer, 0)
- await act(async () => { fireEvent.click(renderer.getByRole("button", { name: "Load older" })) })
+ const root = renderer.getByTestId("activity-body")
+ await act(async () => {
+ fireEvent.wheel(root, { deltaY: -20 })
+ root.scrollTo({ top: 0 })
+ vi.advanceTimersByTime(500)
+ })
auditState.events = [...auditState.events, event("late-earlier", "2026-08-27T11:00:00.000Z")]
updateModal(renderer)
expect(root.scrollTop).toBe(0)
@@ -480,7 +492,6 @@ describe("BotActivityModal CommunitySheet contract", () => {
const { renderer } = renderModal()
const root = scrollBody(renderer, offset)
const top = eventTop(renderer, "event-0")
- fireEvent.click(renderer.getByRole("button", { name: "Load older" }))
auditState.isFetchingNextPage = true
updateModal(renderer)
auditState.events = [...auditState.events, event("earlier-live", liveAt)]
@@ -499,7 +510,6 @@ describe("BotActivityModal CommunitySheet contract", () => {
const completePage = prepareOlderPage()
const { renderer } = renderModal()
const root = scrollBody(renderer, 0)
- fireEvent.click(renderer.getByRole("button", { name: "Load older" }))
auditState.isFetchingNextPage = true
updateModal(renderer)
auditState.events = [...auditState.events, event("earlier-live", "2026-08-27T11:00:00.000Z")]
@@ -512,4 +522,270 @@ describe("BotActivityModal CommunitySheet contract", () => {
updateModal(renderer)
expect(root.scrollTop).toBe(0)
})
+
+ it("loads from the actual upward top band, not initial positioning or a retained sticky date", () => {
+ auditState.events = events(120)
+ auditState.hasNextPage = true
+ const { renderer } = renderModal()
+ act(() => vi.advanceTimersByTime(500))
+ const root = renderer.getByTestId("activity-body")
+ expect(root.scrollTop).toBe(root.scrollHeight - root.clientHeight)
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ scrollBody(renderer, 600)
+ expect(renderer.container.querySelector('[data-activity-row-key*="date:"]')).toBeInTheDocument()
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ scrollBody(renderer, 161)
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ scrollBody(renderer, 160)
+ expect(fetchNextPage).toHaveBeenCalledExactlyOnceWith({ cancelRefetch: false })
+ auditState.isFetchingNextPage = true
+ updateModal(renderer)
+ expect(renderer.getByText("Loading older")).toBeInTheDocument()
+ scrollBody(renderer, 100)
+ expect(fetchNextPage).toHaveBeenCalledOnce()
+ auditState.isFetchingNextPage = false
+ auditState.hasNextPage = false
+ updateModal(renderer)
+ scrollBody(renderer, 0)
+ expect(renderer.getByText("Beginning of log")).toBeInTheDocument()
+ expect(fetchNextPage).toHaveBeenCalledOnce()
+ })
+
+ it("does not page at zero height or fill historical pages on a cached reopen", () => {
+ auditState.events = events(120)
+ auditState.hasNextPage = true
+ bodyHeight = 0
+ const { renderer } = renderModal()
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ resizeBody(300)
+ const root = renderer.getByTestId("activity-body")
+ expect(root.scrollTop).toBe(root.scrollHeight - root.clientHeight)
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ scrollBody(renderer, 600)
+ updateModal(renderer, { open: false })
+ updateModal(renderer)
+ expect(root.scrollTop).toBe(root.scrollHeight - root.clientHeight)
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ })
+
+ it.each([false, true])("waits for an ongoing query fetch before the next upward action (older fetch: %s)", async older => {
+ auditState.events = events(30)
+ auditState.hasNextPage = true
+ auditState.isFetching = true
+ auditState.isFetchingNextPage = older
+ const { renderer } = renderModal()
+ scrollBody(renderer, 0)
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ auditState.isFetching = false
+ auditState.isFetchingNextPage = false
+ updateModal(renderer)
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ scrollBody(renderer, 10)
+ await act(async () => {
+ const root = renderer.getByTestId("activity-body")
+ fireEvent.wheel(root, { deltaY: -20 })
+ root.scrollTo({ top: 0 })
+ })
+ expect(fetchNextPage).toHaveBeenCalledExactlyOnceWith({ cancelRefetch: false })
+ })
+
+ it.each(["wheel", "key", "touch"])("loads one short-list page only after an upward %s gesture", async gesture => {
+ auditState.events = events(2)
+ auditState.hasNextPage = true
+ const completePage = prepareOlderPage()
+ const { renderer } = renderModal()
+ act(() => vi.advanceTimersByTime(500))
+ const root = renderer.getByTestId("activity-body")
+ expect(root.scrollTop).toBe(0)
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ if (gesture === "wheel") {
+ fireEvent.wheel(root, { deltaY: 20 })
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ fireEvent.wheel(root, { deltaY: -20 })
+ } else if (gesture === "key") {
+ const entry = renderer.getByRole("region", { name: "Activity log" })
+ expect(entry).toHaveAttribute("tabindex", "0")
+ act(() => entry.focus())
+ expect(entry).toHaveFocus()
+ fireEvent.keyDown(document.activeElement!, { key: "ArrowDown" })
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ fireEvent.keyDown(document.activeElement!, { key: "ArrowUp" })
+ } else {
+ fireEvent.touchStart(root, { touches: [{ clientY: 100 }] })
+ fireEvent.touchMove(root, { touches: [{ clientY: 80 }] })
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ fireEvent.touchMove(root, { touches: [{ clientY: 110 }] })
+ fireEvent.touchEnd(root, { touches: [] })
+ }
+ expect(fetchNextPage).toHaveBeenCalledExactlyOnceWith({ cancelRefetch: false })
+ const older = event("short-old", "2026-08-27T11:00:00.000Z")
+ auditState.events = [...auditState.events, older]
+ await completePage([older])
+ updateModal(renderer)
+ expect(fetchNextPage).toHaveBeenCalledOnce()
+ expect(auditState.hasNextPage).toBe(true)
+ })
+
+ it("preserves failed-page data and retries only from the explicit action", async () => {
+ auditState.events = events(30)
+ auditState.hasNextPage = true
+ const failPage = prepareOlderPage()
+ const { renderer } = renderModal()
+ const root = scrollBody(renderer, 0)
+ auditState.isFetchNextPageError = true
+ await failPage([], true)
+ updateModal(renderer)
+ expect(renderer.getByRole("button", { name: "Retry older" })).toBeEnabled()
+ expect(renderer.container.querySelector('[data-event-id="event-0"]')).toBeInTheDocument()
+ fireEvent.wheel(root, { deltaY: -20 })
+ fireEvent.keyDown(root, { key: "Home" })
+ updateModal(renderer)
+ expect(fetchNextPage).toHaveBeenCalledOnce()
+ const completePage = prepareOlderPage()
+ fireEvent.click(renderer.getByRole("button", { name: "Retry older" }))
+ expect(fetchNextPage).toHaveBeenCalledTimes(2)
+ auditState.isFetchingNextPage = true
+ updateModal(renderer)
+ expect(renderer.getByRole("button", { name: "Loading older" })).toBeDisabled()
+ const older = event("retry-old", "2026-08-27T11:00:00.000Z")
+ auditState.events = [...auditState.events, older]
+ auditState.isFetchingNextPage = false
+ auditState.isFetchNextPageError = false
+ await completePage([older])
+ updateModal(renderer)
+ expect(renderer.queryByRole("button", { name: "Retry older" })).not.toBeInTheDocument()
+ expect(renderer.container.querySelector('[data-event-id="event-0"]')).toBeInTheDocument()
+ expect(fetchNextPage).toHaveBeenCalledTimes(2)
+ })
+
+ it("lets a wheel gesture cancel the native target without a current-offset write", () => {
+ auditState.events = events(120)
+ const { renderer } = renderModal()
+ const root = renderer.getByTestId("activity-body")
+ const scrollTo = vi.spyOn(root, "scrollTo")
+ fireEvent.wheel(root, { deltaY: -20 })
+ expect(scrollTo).not.toHaveBeenCalled()
+ act(() => root.scrollTo({ top: 100 }))
+ act(() => vi.advanceTimersByTime(500))
+ expect(root.scrollTop).toBe(100)
+ expect(scrollTo).toHaveBeenCalledOnce()
+ })
+
+ it("keeps the reader's event when a measured earlier row grows", () => {
+ auditState.events = events(30)
+ const { renderer } = renderModal()
+ const root = scrollBody(renderer, 600)
+ const top = eventTop(renderer, "event-15")
+ rowHeights.set("event-10", 72)
+ resizeBody(300)
+ expect(eventTop(renderer, "event-15")).toBe(top)
+ expect(root.scrollTop).toBe(628)
+ })
+
+ it.each([false, true])("does not page from native row shrink without user scrolling (armed input: %s)", async armed => {
+ auditState.events = events(30)
+ auditState.hasNextPage = true
+ const { renderer } = renderModal()
+ const root = scrollBody(renderer, 190)
+ const top = eventTop(renderer, "event-3")
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ if (armed) fireEvent.wheel(root, { deltaY: -20 })
+
+ rowHeights.set("event-0", 8)
+ resizeBody(300)
+
+ expect(root.scrollTop).toBe(154)
+ expect(eventTop(renderer, "event-3")).toBe(top)
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ await act(async () => {
+ fireEvent.wheel(root, { deltaY: -20 })
+ root.scrollTo({ top: 150 })
+ })
+ expect(fetchNextPage).toHaveBeenCalledExactlyOnceWith({ cancelRefetch: false })
+ })
+
+ it("requires input for raw offset movement and consumes one ongoing wheel gesture", async () => {
+ auditState.events = events(30)
+ auditState.hasNextPage = true
+ const { renderer } = renderModal()
+ const root = renderer.getByTestId("activity-body")
+ act(() => vi.advanceTimersByTime(500))
+ act(() => root.scrollTo({ top: 150 }))
+ act(() => vi.advanceTimersByTime(500))
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ scrollBody(renderer, 600)
+ await act(async () => {
+ fireEvent.wheel(root, { deltaY: -20 })
+ root.scrollTo({ top: 300 })
+ vi.advanceTimersByTime(50)
+ root.scrollTo({ top: 150 })
+ })
+ expect(fetchNextPage).toHaveBeenCalledExactlyOnceWith({ cancelRefetch: false })
+ act(() => root.scrollTo({ top: 100 }))
+ act(() => vi.advanceTimersByTime(500))
+ expect(fetchNextPage).toHaveBeenCalledOnce()
+ })
+
+ it.each(["key", "touch", "pointer"])("retains upward %s reading into the real top band", async gesture => {
+ auditState.events = events(30)
+ auditState.hasNextPage = true
+ const { renderer } = renderModal()
+ const root = scrollBody(renderer, 600)
+ await act(async () => {
+ if (gesture === "key") {
+ const entry = renderer.getByRole("region", { name: "Activity log" })
+ entry.focus()
+ expect(entry).toHaveFocus()
+ fireEvent.keyDown(document.activeElement!, { key: "PageUp" })
+ } else if (gesture === "touch") {
+ fireEvent.pointerDown(root, { pointerId: 1, button: 0, pointerType: "touch" })
+ fireEvent.touchStart(root, { touches: [{ clientY: 100 }] })
+ fireEvent.touchMove(root, { touches: [{ clientY: 140 }] })
+ } else fireEvent.pointerDown(root, { pointerId: 1, button: 0, pointerType: "mouse" })
+ root.scrollTo({ top: 300 })
+ vi.advanceTimersByTime(50)
+ if (gesture === "touch") {
+ fireEvent.touchEnd(root, { touches: [] })
+ fireEvent.pointerUp(window, { pointerId: 1, pointerType: "touch" })
+ } else if (gesture === "pointer") fireEvent.pointerMove(window, { pointerId: 1, pointerType: "mouse" })
+ root.scrollTo({ top: 150 })
+ if (gesture === "pointer") fireEvent.pointerUp(window, { pointerId: 1, pointerType: "mouse" })
+ })
+ expect(fetchNextPage).toHaveBeenCalledExactlyOnceWith({ cancelRefetch: false })
+ act(() => root.scrollTo({ top: 100 }))
+ act(() => vi.advanceTimersByTime(500))
+ expect(fetchNextPage).toHaveBeenCalledOnce()
+ })
+
+ it.each(["pointerup", "pointercancel"])("retires scrollbar input on %s before later offset movement", eventType => {
+ auditState.events = events(30)
+ auditState.hasNextPage = true
+ const { renderer } = renderModal()
+ const root = scrollBody(renderer, 600)
+ fireEvent.pointerDown(root, { pointerId: 1, button: 0, pointerType: "mouse" })
+ fireEvent(window, new PointerEvent(eventType, { pointerId: 1, pointerType: "mouse" }))
+ act(() => root.scrollTo({ top: 150 }))
+ act(() => vi.advanceTimersByTime(500))
+ expect(fetchNextPage).not.toHaveBeenCalled()
+ })
+
+ it("does not restore a pending page's anchor after changing bots", async () => {
+ auditState.events = events(30)
+ auditState.hasNextPage = true
+ const completePage = prepareOlderPage()
+ const { renderer } = renderModal()
+ scrollBody(renderer, 0)
+ const nextBot = { ...bot, id: "bot-2", name: "Next Bot" }
+ auditState.hasNextPage = false
+ updateModal(renderer, { bot: nextBot })
+ const root = scrollBody(renderer, 600)
+ const top = eventTop(renderer, "event-15")
+ await completePage([event("old-bot-page", "2026-08-27T11:00:00.000Z")])
+ updateModal(renderer, { bot: nextBot })
+ expect(auditHook).toHaveBeenLastCalledWith("bot-2")
+ expect(sheetProps.current!.title).toBe("Next Bot")
+ expect(eventTop(renderer, "event-15")).toBe(top)
+ expect(root.scrollTop).toBe(600)
+ expect(fetchNextPage).toHaveBeenCalledOnce()
+ })
})
diff --git a/src/web/src/components/community/bots/bot-activity-modal.tsx b/src/web/src/components/community/bots/bot-activity-modal.tsx
index 452fe0436..f7d0e8b4a 100644
--- a/src/web/src/components/community/bots/bot-activity-modal.tsx
+++ b/src/web/src/components/community/bots/bot-activity-modal.tsx
@@ -2,7 +2,7 @@
import { useCallback, useLayoutEffect, useMemo, useRef, useEffect } from "react"
import { useAtom, useCreateAtom } from "@tanstack/react-store"
-import { defaultRangeExtractor, useVirtualizer, type Range } from "@tanstack/react-virtual"
+import { defaultRangeExtractor, useVirtualizer, type Range, type VirtualItem } from "@tanstack/react-virtual"
import { AgentAvatar } from "@/components/avatar"
import { CommunitySheet } from "@/components/community/shell/community-sheet"
import { useCanonicalCommunityProfile } from "@/lib/community-db/projections"
@@ -24,9 +24,8 @@ import { BotActivityRow } from "./bot-activity-row"
* - auto-scrolls to the tail on open and on new live rows (only when the
* user was already near the tail — a reader scrolled up to inspect
* history is not yanked back);
- * - a "Load older" button at the top of the log fetches the next (older)
- * page on click; the scroll offset is preserved across the prepend so
- * the row under the eye stays fixed.
+ * - upward reading near the top fetches the next older page; the row under
+ * the eye stays fixed across the prepend, with explicit retry on failure.
*
* Day dividers group rows chronologically without adding per-row chrome.
*/
@@ -50,9 +49,11 @@ export function BotActivityModal({
const {
events,
isLoading,
+ isFetching,
fetchNextPage,
hasNextPage,
isFetchingNextPage,
+ isFetchNextPageError,
loadedPageCount,
} = useBotAuditLog(bot?.id ?? null)
@@ -71,6 +72,14 @@ export function BotActivityModal({
const rows = useMemo(() => flattenActivityRows(chronological, bot?.id ?? ""), [chronological, bot?.id])
const [scrollRoot, setScrollRoot] = useAtom(useCreateAtom<HTMLDivElement | null>(null))
+ const setLogBody = useCallback((element: HTMLDivElement | null) => {
+ if (element) {
+ element.tabIndex = 0
+ element.setAttribute("role", "region")
+ element.setAttribute("aria-label", "Activity log")
+ }
+ setScrollRoot(element)
+ }, [setScrollRoot])
const stickyIndexes = useMemo(() => rows.flatMap((row, index) => row.kind === "date" ? [index] : []), [rows])
const activeStickyIndexRef = useRef<number | null>(null)
const [pendingOlderAnchor, setPendingOlderAnchor] = useAtom(useCreateAtom<{
@@ -82,12 +91,19 @@ export function BotActivityModal({
} | null>(null))
const scrollPaddingStartRef = useRef(0)
const ownsIndexRef = useRef(false)
+ const readingInputRef = useRef<{
+ offset: number
+ height: number
+ totalSize: number
+ fold: Pick<VirtualItem, "key" | "start" | "size"> | null
+ } | null>(null)
const previousTailKeyRef = useRef<string | null>(null)
const didInitialTailScrollRef = useRef(false)
useLayoutEffect(() => {
setPendingOlderAnchor(null)
scrollPaddingStartRef.current = 0
ownsIndexRef.current = false
+ readingInputRef.current = null
previousTailKeyRef.current = null
didInitialTailScrollRef.current = false
}, [open, bot?.id, scrollRoot, setPendingOlderAnchor])
@@ -117,8 +133,13 @@ export function BotActivityModal({
overscan: 8,
enabled: scrollRoot !== null,
useFlushSync: false,
+ onChange: (instance) => {
+ if (!instance.isScrolling) readingInputRef.current = null
+ },
})
+ useLayoutEffect(() => () => virtualizer.cancelScroll(), [open, bot?.id, scrollRoot, virtualizer])
+
useLayoutEffect(() => {
if (!open || !scrollRoot || chronological.length === 0) return
if (!didInitialTailScrollRef.current && scrollRoot.clientHeight > 0
@@ -145,34 +166,11 @@ export function BotActivityModal({
}
})
- useEffect(() => {
- if (!scrollRoot || !open) return
- const cancel = () => {
- setPendingOlderAnchor(null)
- scrollPaddingStartRef.current = 0
- if (ownsIndexRef.current) virtualizer.scrollToOffset(scrollRoot.scrollTop)
- ownsIndexRef.current = false
- didInitialTailScrollRef.current = true
- }
- const wheel = (event: WheelEvent) => { if (event.deltaY !== 0) cancel() }
- const key = (event: KeyboardEvent) => {
- if (["ArrowUp", "ArrowDown", "PageUp", "PageDown", "Home", "End", " "].includes(event.key)) cancel()
- }
- scrollRoot.addEventListener("wheel", wheel, { passive: true })
- scrollRoot.addEventListener("touchstart", cancel, { passive: true })
- scrollRoot.addEventListener("pointerdown", cancel)
- scrollRoot.addEventListener("keydown", key)
- return () => {
- scrollRoot.removeEventListener("wheel", wheel)
- scrollRoot.removeEventListener("touchstart", cancel)
- scrollRoot.removeEventListener("pointerdown", cancel)
- scrollRoot.removeEventListener("keydown", key)
- }
- }, [open, scrollRoot, setPendingOlderAnchor, virtualizer])
-
- const onLoadOlder = () => {
- if (!hasNextPage || isFetchingNextPage) return
- const offset = virtualizer.scrollOffset ?? 0
+ const onLoadOlder = useCallback((retry = false) => {
+ if (!open || !bot?.id || !scrollRoot || scrollRoot.clientHeight <= 0
+ || !didInitialTailScrollRef.current || !hasNextPage || isFetching
+ || (!retry && (isFetchNextPageError || ownsIndexRef.current))) return
+ const offset = scrollRoot.scrollTop
const fold = virtualizer.getVirtualItemForOffset(offset)
let pending: typeof pendingOlderAnchor = null
if (fold && rows[fold.index]?.kind !== "event") {
@@ -195,8 +193,134 @@ export function BotActivityModal({
&& result.data?.pages.slice(current.pageCount).some(page => page.events.length > 0)),
} : current)
}
- void fetchNextPage().then(settle, () => settle(null))
- }
+ void fetchNextPage({ cancelRefetch: false }).then(settle, () => settle(null))
+ }, [open, bot?.id, scrollRoot, hasNextPage, isFetching, isFetchNextPageError, rows, loadedPageCount, fetchNextPage, setPendingOlderAnchor, virtualizer])
+
+ useEffect(() => {
+ if (!scrollRoot || !open) return
+ let previousOffset = scrollRoot.scrollTop
+ let touchY: number | null = null
+ let pointerId: number | null = null
+ const cancel = () => {
+ readingInputRef.current = null
+ setPendingOlderAnchor(null)
+ scrollPaddingStartRef.current = 0
+ virtualizer.cancelScroll()
+ ownsIndexRef.current = false
+ didInitialTailScrollRef.current = true
+ }
+ const qualifyInput = () => {
+ const offset = scrollRoot.scrollTop
+ const fold = virtualizer.getVirtualItemForOffset(offset)
+ readingInputRef.current = {
+ offset,
+ height: scrollRoot.clientHeight,
+ totalSize: virtualizer.getTotalSize(),
+ fold: fold ? { key: fold.key, start: fold.start, size: fold.size } : null,
+ }
+ }
+ const load = () => {
+ readingInputRef.current = null
+ onLoadOlder()
+ }
+ const scroll = () => {
+ const offset = scrollRoot.scrollTop
+ const upwards = offset < previousOffset
+ const downwards = offset > previousOffset
+ previousOffset = offset
+ const input = readingInputRef.current
+ if (!input) return
+ const fold = virtualizer.getVirtualItemForOffset(input.offset)
+ if (downwards || scrollRoot.clientHeight !== input.height || virtualizer.getTotalSize() !== input.totalSize
+ || (fold?.key ?? null) !== (input.fold?.key ?? null)
+ || fold?.start !== input.fold?.start || fold?.size !== input.fold?.size) {
+ readingInputRef.current = null
+ return
+ }
+ if (upwards && offset <= 160) load()
+ }
+ const wheel = (event: WheelEvent) => {
+ if (event.deltaY === 0) return
+ cancel()
+ if (event.deltaY < 0) {
+ qualifyInput()
+ if (scrollRoot.scrollTop <= 0) load()
+ }
+ }
+ const touchStart = (event: TouchEvent) => {
+ pointerId = null
+ touchY = event.touches[0]?.clientY ?? null
+ cancel()
+ }
+ const touchMove = (event: TouchEvent) => {
+ const nextY = event.touches[0]?.clientY ?? null
+ if (touchY !== null && nextY !== null && nextY !== touchY) {
+ if (nextY > touchY) {
+ qualifyInput()
+ if (scrollRoot.scrollTop <= 0) load()
+ } else readingInputRef.current = null
+ }
+ touchY = nextY
+ }
+ const touchEnd = () => { touchY = null }
+ const touchCancel = () => {
+ touchY = null
+ readingInputRef.current = null
+ }
+ const pointerDown = (event: PointerEvent) => {
+ cancel()
+ if (event.button === 0 && event.pointerType !== "touch") {
+ pointerId = event.pointerId
+ qualifyInput()
+ }
+ }
+ const pointerMove = (event: PointerEvent) => {
+ if (pointerId !== null && event.pointerId === pointerId) qualifyInput()
+ }
+ const pointerEnd = (event: PointerEvent) => {
+ if (event.pointerId !== pointerId) return
+ scroll()
+ pointerId = null
+ readingInputRef.current = null
+ }
+ const pointerCancel = (event: PointerEvent) => {
+ if (event.pointerId !== pointerId) return
+ pointerId = null
+ readingInputRef.current = null
+ }
+ const key = (event: KeyboardEvent) => {
+ if (["ArrowUp", "ArrowDown", "PageUp", "PageDown", "Home", "End", " "].includes(event.key)) cancel()
+ if (["ArrowUp", "PageUp", "Home"].includes(event.key) || (event.key === " " && event.shiftKey)) {
+ qualifyInput()
+ if (scrollRoot.scrollTop <= 0) load()
+ }
+ }
+ scrollRoot.addEventListener("scroll", scroll, { passive: true })
+ scrollRoot.addEventListener("wheel", wheel, { passive: true })
+ scrollRoot.addEventListener("touchstart", touchStart, { passive: true })
+ scrollRoot.addEventListener("touchmove", touchMove, { passive: true })
+ scrollRoot.addEventListener("touchend", touchEnd, { passive: true })
+ scrollRoot.addEventListener("touchcancel", touchCancel, { passive: true })
+ scrollRoot.addEventListener("pointerdown", pointerDown)
+ window.addEventListener("pointermove", pointerMove, { passive: true })
+ window.addEventListener("pointerup", pointerEnd, { passive: true })
+ window.addEventListener("pointercancel", pointerCancel, { passive: true })
+ scrollRoot.addEventListener("keydown", key)
+ return () => {
+ readingInputRef.current = null
+ scrollRoot.removeEventListener("scroll", scroll)
+ scrollRoot.removeEventListener("wheel", wheel)
+ scrollRoot.removeEventListener("touchstart", touchStart)
+ scrollRoot.removeEventListener("touchmove", touchMove)
+ scrollRoot.removeEventListener("touchend", touchEnd)
+ scrollRoot.removeEventListener("touchcancel", touchCancel)
+ scrollRoot.removeEventListener("pointerdown", pointerDown)
+ window.removeEventListener("pointermove", pointerMove)
+ window.removeEventListener("pointerup", pointerEnd)
+ window.removeEventListener("pointercancel", pointerCancel)
+ scrollRoot.removeEventListener("keydown", key)
+ }
+ }, [open, scrollRoot, onLoadOlder, setPendingOlderAnchor, virtualizer])
return (
<CommunitySheet
@@ -224,8 +348,8 @@ export function BotActivityModal({
desktopWidth={672}
resizable
contentTestId={tid.botActivityModal}
- bodyRef={setScrollRoot}
- bodyClassName="bg-background p-0"
+ bodyRef={setLogBody}
+ bodyClassName="bg-background p-0 focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring focus-visible:outline-none"
>
{isLoading && chronological.length === 0 ? (
<SkeletonRows />
@@ -254,14 +378,16 @@ export function BotActivityModal({
>
{row.kind === "event" ? <BotActivityRow event={row.event} /> : row.kind === "date" ? <DayDivider label={row.label} /> : hasNextPage ? (
<div className="flex justify-center py-2">
- <button
+ {isFetchNextPageError ? <button
type="button"
- onClick={onLoadOlder}
- disabled={isFetchingNextPage}
+ onClick={() => onLoadOlder(true)}
+ disabled={isFetching}
className="min-h-11 rounded-md px-3 py-1 font-mono text-[10px] uppercase tracking-wider text-muted-foreground hover:bg-accent hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-60 sm:min-h-8"
>
- {isFetchingNextPage ? "Loading older" : "Load older"}
- </button>
+ {isFetchingNextPage ? "Loading older" : "Retry older"}
+ </button> : <span role="status" className="py-1 font-mono text-[10px] uppercase tracking-wider text-muted-foreground">
+ {isFetchingNextPage ? "Loading older" : "Scroll up for older"}
+ </span>}
</div>
) : (
<div className="py-2 text-center font-mono text-[10px] uppercase tracking-wider text-muted-foreground/40">
diff --git a/src/web/src/hooks/community/use-bot-audit-log.dom.test.ts b/src/web/src/hooks/community/use-bot-audit-log.dom.test.ts
index 801eec422..cc1130cc7 100644
--- a/src/web/src/hooks/community/use-bot-audit-log.dom.test.ts
+++ b/src/web/src/hooks/community/use-bot-audit-log.dom.test.ts
@@ -5,6 +5,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest"
import { act, renderHook, waitFor } from "@/test/react-dom-harness"
import { appendBotAuditEvent, useBotAuditLog, UNOBSERVED_AUDIT_HEAD_LIMIT, type AuditEvent, type AuditLogPage } from "./use-bot-audit-log"
import { communityKeys } from "@/lib/query-keys"
+import { ApiError } from "@/lib/errors"
const mockApiFetch = vi.fn()
vi.mock("@/lib/api/client", () => ({
@@ -219,4 +220,70 @@ describe("canonical audit pagination and retention", () => {
await waitFor(() => expect(result.current.events.map((e) => e.id)).toEqual(["live", "head"]))
expect(result.current.hasNextPage).toBe(true)
})
+
+ it("projects a background fetch and reuses it before requesting the full older cursor", async () => {
+ const held = heldPage()
+ mockApiFetch.mockResolvedValueOnce({ events: [auditEvent("head", 1)], nextCursor: cursor })
+ .mockReturnValueOnce(held.promise)
+ const { result, queryClient } = renderAuditLog("b1")
+ await waitFor(() => expect(result.current.events.map(e => e.id)).toEqual(["head"]))
+ let refetching!: Promise<void>
+ act(() => { refetching = queryClient.refetchQueries({ queryKey: communityKeys.botAuditLog("b1"), exact: true }) })
+ await waitFor(() => expect(result.current.isFetching).toBe(true))
+ expect(result.current.isFetchingNextPage).toBe(false)
+ const signal = mockApiFetch.mock.calls[1]![1].signal as AbortSignal
+ expect(signal).toBeDefined()
+ let overlapping!: ReturnType<typeof result.current.fetchNextPage>
+ act(() => { overlapping = result.current.fetchNextPage({ cancelRefetch: false }) })
+ expect(mockApiFetch).toHaveBeenCalledTimes(2)
+ expect(signal.aborted).toBe(false)
+ await act(async () => {
+ held.resolve({ events: [auditEvent("head", 1)], nextCursor: cursor })
+ await Promise.all([refetching, overlapping])
+ })
+ await waitFor(() => expect(result.current.isFetching).toBe(false))
+ expect(result.current.loadedPageCount).toBe(1)
+ const tied = { ...auditEvent("a-before-head", 1), createdAt: cursor.beforeCreatedAt }
+ mockApiFetch.mockResolvedValueOnce({ events: [auditEvent("head", 1), tied, auditEvent("old", 0)], nextCursor: null })
+ await act(async () => { await result.current.fetchNextPage({ cancelRefetch: false }) })
+ await waitFor(() => expect(result.current.events.map(e => e.id)).toEqual(["head", "a-before-head", "old"]))
+ expect(mockApiFetch).toHaveBeenCalledTimes(3)
+ const url = new URL(mockApiFetch.mock.calls[2]![0], "https://alook.invalid")
+ expect(url.pathname).toBe("/api/community/bots/b1/audit-log")
+ expect(Object.fromEntries(url.searchParams)).toEqual({ limit: "50", beforeCreatedAt: cursor.beforeCreatedAt, beforeId: cursor.beforeId })
+ expect(queryClient.getQueryData<InfiniteData<AuditLogPage>>(communityKeys.botAuditLog("b1"))?.pageParams).toEqual([null, cursor])
+ expect(result.current.hasNextPage).toBe(false)
+ expect(signal.aborted).toBe(false)
+ })
+
+ it("keeps native older-page error state and loaded data until an explicit retry succeeds", async () => {
+ const held = heldPage()
+ mockApiFetch.mockResolvedValueOnce({ events: [auditEvent("head", 1)], nextCursor: cursor })
+ .mockRejectedValueOnce(new ApiError("older page not found", 404))
+ .mockReturnValueOnce(held.promise)
+ const { result, queryClient } = renderAuditLog("b1")
+ await waitFor(() => expect(result.current.events).toHaveLength(1))
+ await act(async () => { await result.current.fetchNextPage({ cancelRefetch: false }) })
+ await waitFor(() => expect(result.current.isFetchNextPageError).toBe(true))
+ expect(result.current.isFetching).toBe(false)
+ expect(result.current.events.map(e => e.id)).toEqual(["head"])
+ expect(result.current.loadedPageCount).toBe(1)
+ expect(mockApiFetch).toHaveBeenCalledTimes(2)
+ let retrying!: ReturnType<typeof result.current.fetchNextPage>
+ act(() => { retrying = result.current.fetchNextPage({ cancelRefetch: false }) })
+ await waitFor(() => expect(result.current.isFetchingNextPage).toBe(true))
+ expect(result.current.isFetching).toBe(true)
+ expect(result.current.events.map(e => e.id)).toEqual(["head"])
+ await act(async () => {
+ held.resolve({ events: [auditEvent("old", 0)], nextCursor: null })
+ await retrying
+ })
+ await waitFor(() => expect(result.current.isFetchNextPageError).toBe(false))
+ expect(result.current.isFetching).toBe(false)
+ expect(result.current.events.map(e => e.id)).toEqual(["head", "old"])
+ expect(result.current.loadedPageCount).toBe(2)
+ expect(mockApiFetch).toHaveBeenCalledTimes(3)
+ expect(queryClient.getQueryData<InfiniteData<AuditLogPage>>(communityKeys.botAuditLog("b1"))?.pageParams).toEqual([null, cursor])
+ expect(result.current.hasNextPage).toBe(false)
+ })
})
diff --git a/src/web/src/hooks/community/use-bot-audit-log.ts b/src/web/src/hooks/community/use-bot-audit-log.ts
index ea7aa6369..9d02fe49b 100644
--- a/src/web/src/hooks/community/use-bot-audit-log.ts
+++ b/src/web/src/hooks/community/use-bot-audit-log.ts
@@ -131,9 +131,11 @@ export function useBotAuditLog(botId: string | null | undefined) {
error: query.error,
isError: query.isError,
isLoading: query.isLoading,
+ isFetching: query.isFetching,
fetchNextPage: query.fetchNextPage,
hasNextPage: query.hasNextPage,
isFetchingNextPage: query.isFetchingNextPage,
+ isFetchNextPageError: query.isFetchNextPageError,
loadedPageCount: query.data?.pages.length ?? 0,
}
}