The open-source agent harness - the runtime layer that turns an LLM into a working agent.
fix: ThreadListContainer pagination logic and add tests (#271)
Vinit233df191ebce
diff --git a/packages/trueforge-ui-sdk/src/containers/ThreadListContainer.pagination.test.tsx b/packages/trueforge-ui-sdk/src/containers/ThreadListContainer.pagination.test.tsxdeleted file mode 100644index af773811b..000000000--- a/packages/trueforge-ui-sdk/src/containers/ThreadListContainer.pagination.test.tsx+++ /dev/null@@ -1,126 +0,0 @@-// @vitest-environment jsdom-import { fireEvent, render, waitFor } from '@testing-library/react';-import type { ReactNode } from 'react';-import { describe, expect, it, vi } from 'vitest';--const loadMore = vi.fn().mockResolvedValue(undefined);--vi.mock('@assistant-ui/react', () => ({- useAui: () => ({- threads: () => ({- loadMore,- switchToThread: vi.fn(),- switchToNewThread: vi.fn(),- }),- }),- useAuiState: (selector: (s: Record<string, unknown>) => unknown) =>- selector({- threads: {- isLoading: false,- isLoadingMore: false,- hasMore: true,- threadIds: ['t1'],- threadItems: [{ id: 't1', remoteId: 's1', lastMessageAt: undefined }],- mainThreadId: 't1',- },- threadListItem: {- id: 't1',- remoteId: 's1',- title: 'Session',- lastMessageAt: undefined,- custom: undefined,- },- }),- ThreadListItemByIndexProvider: ({ children }: { children?: ReactNode }) => <>{children}</>,- ThreadListPrimitive: {- Root: ({ children, className }: { children?: ReactNode; className?: string }) => (- <div className={className}>{children}</div>- ),- Items: ({ children }: { children: (args: { threadListItem: { remoteId: string } }) => ReactNode }) => (- <>{children({ threadListItem: { remoteId: 's1' } })}</>- ),- },- ThreadListItemPrimitive: {- Root: ({ children, className }: { children?: ReactNode; className?: string }) => (- <div className={className}>{children}</div>- ),- Delete: ({ children }: { children?: ReactNode }) => <button type="button">{children}</button>,- },- ThreadListItemMorePrimitive: {- Root: ({ children }: { children?: ReactNode }) => <>{children}</>,- Trigger: ({ children }: { children?: ReactNode }) => <button type="button">{children}</button>,- Content: ({ children }: { children?: ReactNode }) => <div>{children}</div>,- Item: ({ children }: { children?: ReactNode }) => <div>{children}</div>,- },-}));--vi.mock('../server/ServerContext.js', () => ({- useOptionalServer: () => undefined,-}));--vi.mock('../server/ShellModeContext.js', () => ({- useOptionalShellMode: () => ({- isLibraryEnabled: false,- isNewChatEnabled: true,- isComposerEnabled: false,- mode: { status: 'active', isMutable: false, agentName: 'agent', agentId: 'agent', locked: false },- setSettingsOpen: vi.fn(),- selectLibraryAgent: vi.fn(),- openDraft: vi.fn(),- openHistorySession: vi.fn(),- }),-}));--import { ThreadListContainer } from './ThreadListContainer.js';--describe('ThreadListContainer pagination', () => {- it('does not load more pages until the history list is scrolled', async () => {- loadMore.mockClear();- const { container } = render(- <div style={{ height: 200 }}>- <ThreadListContainer />- </div>,- );-- const viewport = container.querySelector('[data-slot="aui_thread-list-viewport"]');- expect(viewport).toBeTruthy();-- await new Promise(resolve => setTimeout(resolve, 0));- expect(loadMore).not.toHaveBeenCalled();-- Object.defineProperty(viewport, 'scrollTop', { configurable: true, value: 720 });- Object.defineProperty(viewport, 'scrollHeight', { configurable: true, value: 800 });- Object.defineProperty(viewport, 'clientHeight', { configurable: true, value: 200 });- fireEvent.scroll(viewport!);-- await waitFor(() => expect(loadMore).toHaveBeenCalledTimes(1));- });-- it('ignores scroll when still at the top of the list', async () => {- loadMore.mockClear();- const { container } = render(<ThreadListContainer />);- const viewport = container.querySelector('[data-slot="aui_thread-list-viewport"]');-- Object.defineProperty(viewport, 'scrollTop', { configurable: true, value: 0 });- Object.defineProperty(viewport, 'scrollHeight', { configurable: true, value: 800 });- Object.defineProperty(viewport, 'clientHeight', { configurable: true, value: 200 });- fireEvent.scroll(viewport!);-- await new Promise(resolve => setTimeout(resolve, 0));- expect(loadMore).not.toHaveBeenCalled();- });-- it('ignores scroll when not near the bottom', async () => {- loadMore.mockClear();- const { container } = render(<ThreadListContainer />);- const viewport = container.querySelector('[data-slot="aui_thread-list-viewport"]');-- Object.defineProperty(viewport, 'scrollTop', { configurable: true, value: 50 });- Object.defineProperty(viewport, 'scrollHeight', { configurable: true, value: 800 });- Object.defineProperty(viewport, 'clientHeight', { configurable: true, value: 200 });- fireEvent.scroll(viewport!);-- await new Promise(resolve => setTimeout(resolve, 0));- expect(loadMore).not.toHaveBeenCalled();- });-});diff --git a/packages/trueforge-ui-sdk/src/containers/ThreadListContainer.tsx b/packages/trueforge-ui-sdk/src/containers/ThreadListContainer.tsxindex 86930f23f..ab2773fd0 100644--- a/packages/trueforge-ui-sdk/src/containers/ThreadListContainer.tsx+++ b/packages/trueforge-ui-sdk/src/containers/ThreadListContainer.tsx@@ -251,6 +251,7 @@ export function ThreadListContainer({ onThreadOpen }: ThreadListContainerProps =const aui = useAui();const server = useOptionalServer();const isLoading = useAuiState(s => s.threads.isLoading);+ const isLoadingMore = useAuiState(s => s.threads.isLoadingMore);const hasMore = useAuiState(s => s.threads.hasMore);const threadIds = useAuiState(s => s.threads.threadIds);const shell = useOptionalShellMode();@@ -262,7 +263,6 @@ export function ThreadListContainer({ onThreadOpen }: ThreadListContainerProps =const ThreadListEmptyState = useSlot('ThreadListEmptyState');const viewportRef = useRef<HTMLDivElement>(null);- const loadMoreInflightRef = useRef(false);const hasMoreRef = useRef(hasMore);const auiRef = useRef(aui);hasMoreRef.current = hasMore;@@ -272,39 +272,45 @@ export function ThreadListContainer({ onThreadOpen }: ThreadListContainerProps =const isIdle = shell?.mode.status === 'idle';const canDeleteSession = typeof server?.deleteSession === 'function';- // Scroll-driven pagination only — never auto-chain pages while the sentinel- // is visible on mount (that drained every listSessions page).+ // Fill an underflowing viewport; once it scrolls, paginate only near the bottom.+ // Re-measure after commit (threadIds / hasMore) instead of rAF-chaining, which+ // raced layout and could drain every remaining listSessions page.+ // The runtime owns request deduplication, so Strict Mode remounts can recheck safely.useEffect(() => {- if (isIdle) return;+ if (isIdle || isLoading || isLoadingMore) return;const viewport = viewportRef.current;if (!viewport) return;let cancelled = false;- let chainRaf = 0;const tryLoadMore = () => {- if (cancelled || !hasMoreRef.current || loadMoreInflightRef.current) return;- // Require a real scroll so a short first page does not fill-drain the cursor.- if (viewport.scrollTop <= 0) return;+ if (cancelled || !hasMoreRef.current) return;+ if (viewport.clientHeight <= 0) return;+const remaining = viewport.scrollHeight - viewport.scrollTop - viewport.clientHeight;- if (remaining > LOAD_MORE_BOTTOM_PX) return;-- loadMoreInflightRef.current = true;- void Promise.resolve(auiRef.current.threads().loadMore()).finally(() => {- loadMoreInflightRef.current = false;- if (cancelled) return;- // Still glued to the bottom after append → fetch the next page.- chainRaf = requestAnimationFrame(() => tryLoadMore());- });+ if (viewport.scrollHeight > viewport.clientHeight && remaining > LOAD_MORE_BOTTOM_PX) return;++ void auiRef.current.threads().loadMore();};viewport.addEventListener('scroll', tryLoadMore, { passive: true });+ const resizeObserver = typeof ResizeObserver === 'undefined' ? undefined : new ResizeObserver(() => tryLoadMore());+ if (resizeObserver) {+ resizeObserver.observe(viewport);+ } else {+ window.addEventListener('resize', tryLoadMore);+ }+ tryLoadMore();+return () => {cancelled = true;- cancelAnimationFrame(chainRaf);viewport.removeEventListener('scroll', tryLoadMore);+ resizeObserver?.disconnect();+ if (!resizeObserver) {+ window.removeEventListener('resize', tryLoadMore);+ }};- }, [isIdle]);+ }, [hasMore, isIdle, isLoading, isLoadingMore, threadIds.length]);const handleNewChat = () => {onThreadOpen?.();diff --git a/packages/trueforge-ui-sdk/test/containers/ThreadListContainer.pagination.test.tsx b/packages/trueforge-ui-sdk/test/containers/ThreadListContainer.pagination.test.tsxnew file mode 100644index 000000000..27d607ec3--- /dev/null+++ b/packages/trueforge-ui-sdk/test/containers/ThreadListContainer.pagination.test.tsx@@ -0,0 +1,202 @@+// @vitest-environment jsdom+import { fireEvent, render, waitFor } from '@testing-library/react';+import { StrictMode, type ReactNode } from 'react';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++import { ThreadListContainer } from '@/containers/ThreadListContainer.js';++const { loadMore } = vi.hoisted(() => ({+ loadMore: vi.fn().mockResolvedValue(undefined),+}));++let resizeCallback: ResizeObserverCallback | undefined;+const resizeObserverStub: ResizeObserver = {+ observe(): void {},+ unobserve(): void {},+ disconnect(): void {},+};++class ResizeObserverMock implements ResizeObserver {+ constructor(callback: ResizeObserverCallback) {+ resizeCallback = callback;+ }++ observe(): void {}+ unobserve(): void {}+ disconnect(): void {}+}++vi.mock('@assistant-ui/react', () => ({+ useAui: () => ({+ threads: () => ({+ loadMore,+ switchToThread: vi.fn(),+ switchToNewThread: vi.fn(),+ }),+ }),+ useAuiState: (selector: (state: Record<string, unknown>) => unknown) =>+ selector({+ threads: {+ isLoading: false,+ isLoadingMore: false,+ hasMore: true,+ threadIds: ['t1'],+ threadItems: [{ id: 't1', remoteId: 's1', lastMessageAt: undefined }],+ mainThreadId: 't1',+ },+ threadListItem: {+ id: 't1',+ remoteId: 's1',+ title: 'Session',+ lastMessageAt: undefined,+ custom: undefined,+ },+ }),+ ThreadListItemByIndexProvider: ({ children }: { children?: ReactNode }) => <>{children}</>,+ ThreadListPrimitive: {+ Root: ({ children, className }: { children?: ReactNode; className?: string }) => (+ <div className={className}>{children}</div>+ ),+ },+ ThreadListItemPrimitive: {+ Root: ({ children, className }: { children?: ReactNode; className?: string }) => (+ <div className={className}>{children}</div>+ ),+ Delete: ({ children }: { children?: ReactNode }) => <button type="button">{children}</button>,+ },+ ThreadListItemMorePrimitive: {+ Root: ({ children }: { children?: ReactNode }) => <>{children}</>,+ Trigger: ({ children }: { children?: ReactNode }) => <button type="button">{children}</button>,+ Content: ({ children }: { children?: ReactNode }) => <div>{children}</div>,+ Item: ({ children }: { children?: ReactNode }) => <div>{children}</div>,+ },+}));++vi.mock('@/server/ServerContext.js', () => ({+ useOptionalServer: () => undefined,+}));++vi.mock('@/server/ShellModeContext.js', () => ({+ useOptionalShellMode: () => ({+ isLibraryEnabled: false,+ isNewChatEnabled: true,+ isComposerEnabled: false,+ mode: { status: 'active', isMutable: false, agentName: 'agent', agentId: 'agent', locked: false },+ setSettingsOpen: vi.fn(),+ selectLibraryAgent: vi.fn(),+ openDraft: vi.fn(),+ openHistorySession: vi.fn(),+ }),+}));++function getViewport(container: HTMLElement): HTMLElement {+ const viewport = container.querySelector('[data-slot="aui_thread-list-viewport"]');+ if (!(viewport instanceof HTMLElement)) {+ throw new Error('Expected thread list viewport');+ }+ return viewport;+}++function notifyViewportResize(): void {+ if (resizeCallback === undefined) {+ throw new Error('Expected viewport ResizeObserver');+ }+ resizeCallback([], resizeObserverStub);+}++beforeEach(() => {+ resizeCallback = undefined;+ vi.stubGlobal('ResizeObserver', ResizeObserverMock);+});++afterEach(() => {+ vi.restoreAllMocks();+ vi.unstubAllGlobals();+ loadMore.mockReset().mockResolvedValue(undefined);+});++describe('ThreadListContainer pagination', () => {+ it('remeasures when a hidden viewport becomes visible', async () => {+ loadMore.mockClear();+ const { container } = render(<ThreadListContainer />);+ const viewport = getViewport(container);++ expect(loadMore).not.toHaveBeenCalled();+ Object.defineProperty(viewport, 'scrollHeight', { configurable: true, value: 200 });+ Object.defineProperty(viewport, 'clientHeight', { configurable: true, value: 400 });++ notifyViewportResize();++ await waitFor(() => expect(loadMore).toHaveBeenCalledTimes(1));+ });++ it('rechecks an underflowing viewport after a Strict Mode effect remount', () => {+ loadMore.mockReturnValue(new Promise<void>(() => {}));+ const scrollHeight = vi.spyOn(HTMLElement.prototype, 'scrollHeight', 'get').mockReturnValue(200);+ const clientHeight = vi.spyOn(HTMLElement.prototype, 'clientHeight', 'get').mockReturnValue(400);++ render(+ <StrictMode>+ <ThreadListContainer />+ </StrictMode>,+ );++ expect(loadMore).toHaveBeenCalledTimes(2);+ scrollHeight.mockRestore();+ clientHeight.mockRestore();+ });++ it('loads more when the first page does not fill the viewport', async () => {+ loadMore.mockClear();+ const { container } = render(<ThreadListContainer />);+ const viewport = getViewport(container);++ Object.defineProperty(viewport, 'scrollTop', { configurable: true, value: 0 });+ Object.defineProperty(viewport, 'scrollHeight', { configurable: true, value: 200 });+ Object.defineProperty(viewport, 'clientHeight', { configurable: true, value: 400 });+ notifyViewportResize();++ await waitFor(() => expect(loadMore).toHaveBeenCalledTimes(1));+ });++ it('loads more when scrolled near the bottom', async () => {+ loadMore.mockClear();+ const { container } = render(<ThreadListContainer />);+ const viewport = getViewport(container);++ Object.defineProperty(viewport, 'scrollTop', { configurable: true, value: 520 });+ Object.defineProperty(viewport, 'scrollHeight', { configurable: true, value: 800 });+ Object.defineProperty(viewport, 'clientHeight', { configurable: true, value: 200 });+ fireEvent.scroll(viewport);++ await waitFor(() => expect(loadMore).toHaveBeenCalledTimes(1));+ });++ it('does not load more before reaching the bottom', async () => {+ loadMore.mockClear();+ const { container } = render(<ThreadListContainer />);+ const viewport = getViewport(container);++ Object.defineProperty(viewport, 'scrollTop', { configurable: true, value: 50 });+ Object.defineProperty(viewport, 'scrollHeight', { configurable: true, value: 800 });+ Object.defineProperty(viewport, 'clientHeight', { configurable: true, value: 200 });+ fireEvent.scroll(viewport);++ await new Promise(resolve => setTimeout(resolve, 0));+ expect(loadMore).not.toHaveBeenCalled();+ });++ it('does not load more at the top of an overflowing list', async () => {+ loadMore.mockClear();+ const { container } = render(<ThreadListContainer />);+ const viewport = getViewport(container);++ Object.defineProperty(viewport, 'scrollTop', { configurable: true, value: 0 });+ Object.defineProperty(viewport, 'scrollHeight', { configurable: true, value: 800 });+ Object.defineProperty(viewport, 'clientHeight', { configurable: true, value: 200 });+ notifyViewportResize();++ await new Promise(resolve => setTimeout(resolve, 0));+ expect(loadMore).not.toHaveBeenCalled();+ });+});