Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

fix: paginate Agents and Schedules tables from API page tokens (#863)

Govinda Vashishthafdd852047aca
diff --git a/.changeset/token-table-pagination.md b/.changeset/token-table-pagination.md
new file mode 100644
index 000000000..4cbeabf03
--- /dev/null
+++ b/.changeset/token-table-pagination.md
@@ -0,0 +1,6 @@
+---
+'@truefoundry/trueforge-assistant-ui-runtime': patch
+'@truefoundry/trueforge-ui': patch
+---
+
+Drive Agents and Schedules table pagination from API next/previous page tokens instead of row-count heuristics.
diff --git a/packages/assistant-ui-runtime/src/server/types.ts b/packages/assistant-ui-runtime/src/server/types.ts
index 7a9c04d63..cb22a511e 100644
--- a/packages/assistant-ui-runtime/src/server/types.ts
+++ b/packages/assistant-ui-runtime/src/server/types.ts
@@ -74,7 +74,7 @@ export interface AgentSelectorEntry {
export interface SearchAgentSelectorParams {
query?: string;
limit?: number;
- offset?: number;
+ pageToken?: string;
}
// ---------------------------------------------------------------------------
@@ -206,6 +206,7 @@ export interface UpdateSessionRequest<TSpec extends AgentSpec = AgentSpec> {
export interface ListResult<T> {
data: T[];
nextPageToken?: string;
+ previousPageToken?: string;
}
export type ListSessionsOrder = 'asc' | 'desc';
@@ -455,7 +456,7 @@ export interface AgentBuilderServer<
getMcp(): Promise<TMcp[]>;
getMcpConnector?(req: { connectorId: string }): Promise<TMcp>;
getMcpTools?(req: { connectorId: string }): Promise<TMcpTool[]>;
- searchAgents(req?: SearchAgentSelectorParams): Promise<TAgent[]>;
+ searchAgents(req?: SearchAgentSelectorParams): Promise<ListResult<TAgent>>;
saveAgent(req: SaveAgentRequest<TSpec>): Promise<TSave>;
deleteAgent?(req: { agentName: string }): Promise<void>;
}
diff --git a/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsx b/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsx
index d5349a4dd..d52f1366b 100644
--- a/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsx
+++ b/packages/trueforge-ui/src/atoms/AgentsLibraryButton.tsx
@@ -29,10 +29,14 @@ export function AgentsLibraryButton({ className, compact = false }: AgentsLibrar
let cancelled = false;
void server
.searchAgents({ limit: SEARCH_AGENTS_PAGE_SIZE })
- .then(rows => {
+ .then(page => {
if (cancelled) return;
- // API has no total; a full page means there may be more.
- setCountLabel(rows.length >= SEARCH_AGENTS_PAGE_SIZE ? `${SEARCH_AGENTS_PAGE_SIZE}+` : String(rows.length));
+ // API has no total; a next-page token means there may be more.
+ setCountLabel(
+ page.nextPageToken != null && page.nextPageToken !== ''
+ ? `${SEARCH_AGENTS_PAGE_SIZE}+`
+ : String(page.data.length),
+ );
})
.catch(() => undefined);
return () => {
diff --git a/packages/trueforge-ui/src/atoms/lib/useSearchAgentsList.ts b/packages/trueforge-ui/src/atoms/lib/useSearchAgentsList.ts
index e9370fd88..23a67b4aa 100644
--- a/packages/trueforge-ui/src/atoms/lib/useSearchAgentsList.ts
+++ b/packages/trueforge-ui/src/atoms/lib/useSearchAgentsList.ts
@@ -17,46 +17,56 @@ function clampPageSize(size: number): number {
return Math.min(Math.max(size, 1), SEARCH_AGENTS_PAGE_MAX);
}
-/** Drain every `searchAgents` page (offset pagination). */
+/** Drain every `searchAgents` page (token pagination). */
export async function searchAllAgents(
server: Pick<AgentBuilderServer, 'searchAgents'>,
- offset = 0,
+ pageToken?: string,
): Promise<AgentLibraryEntry[]> {
- const rows = await server.searchAgents({ limit: SEARCH_AGENTS_PAGE_SIZE, offset });
- if (rows.length < SEARCH_AGENTS_PAGE_SIZE) return rows;
- return [...rows, ...(await searchAllAgents(server, offset + rows.length))];
+ const page = await server.searchAgents({
+ limit: SEARCH_AGENTS_PAGE_SIZE,
+ ...(pageToken === undefined || pageToken === '' ? {} : { pageToken }),
+ });
+ if (page.nextPageToken == null || page.nextPageToken === '') return page.data;
+ return [...page.data, ...(await searchAllAgents(server, page.nextPageToken))];
}
/** Exact-name lookup walks server-filtered pages until a precise match is found. */
export async function findAgentByName({
server,
agentName,
- offset = 0,
+ pageToken,
}: {
server: Pick<AgentBuilderServer, 'searchAgents'>;
agentName: string;
- offset?: number;
+ pageToken?: string;
}): Promise<AgentLibraryEntry | undefined> {
- const rows = await server.searchAgents({ query: agentName, limit: SEARCH_AGENTS_PAGE_SIZE, offset });
- const match = rows.find(agent => agent.name === agentName);
- if (match != null || rows.length < SEARCH_AGENTS_PAGE_SIZE) return match;
- return findAgentByName({ server, agentName, offset: offset + rows.length });
+ const page = await server.searchAgents({
+ query: agentName,
+ limit: SEARCH_AGENTS_PAGE_SIZE,
+ ...(pageToken === undefined || pageToken === '' ? {} : { pageToken }),
+ });
+ const match = page.data.find(agent => agent.name === agentName);
+ if (match != null || page.nextPageToken == null || page.nextPageToken === '') return match;
+ return findAgentByName({ server, agentName, pageToken: page.nextPageToken });
}
/** Resolve by agent id or exact name by walking unfiltered pages (ids are not name-searchable). */
export async function findLibraryAgent({
server,
agentKey,
- offset = 0,
+ pageToken,
}: {
server: Pick<AgentBuilderServer, 'searchAgents'>;
agentKey: string;
- offset?: number;
+ pageToken?: string;
}): Promise<AgentLibraryEntry | undefined> {
- const rows = await server.searchAgents({ limit: SEARCH_AGENTS_PAGE_SIZE, offset });
- const match = rows.find(agent => agent.name === agentKey || agent.agentId === agentKey);
- if (match != null || rows.length < SEARCH_AGENTS_PAGE_SIZE) return match;
- return findLibraryAgent({ server, agentKey, offset: offset + rows.length });
+ const page = await server.searchAgents({
+ limit: SEARCH_AGENTS_PAGE_SIZE,
+ ...(pageToken === undefined || pageToken === '' ? {} : { pageToken }),
+ });
+ const match = page.data.find(agent => agent.name === agentKey || agent.agentId === agentKey);
+ if (match != null || page.nextPageToken == null || page.nextPageToken === '') return match;
+ return findLibraryAgent({ server, agentKey, pageToken: page.nextPageToken });
}
export type UseSearchAgentsListOptions = {
@@ -95,7 +105,7 @@ export type UseSearchAgentsListResult = {
};
/**
- * Debounced `searchAgents` with offset pagination.
+ * Debounced `searchAgents` with token pagination.
* Infinite mode: attach `listRef` / `sentinelRef` for IntersectionObserver load-more.
* Paged mode: use `goPrev` / `goNext` / `setPageSize` (rows replaced each fetch).
*/
@@ -117,12 +127,14 @@ export function useSearchAgentsList({
const [error, setError] = useState<string | null>(null);
const [hasMore, setHasMore] = useState(false);
const [pageSize, setPageSizeState] = useState(() => clampPageSize(limitOption));
- const [offset, setOffset] = useState(0);
+ const [pageToken, setPageToken] = useState<string | undefined>(undefined);
+ const [nextPageToken, setNextPageToken] = useState<string | undefined>(undefined);
+ const [previousPageToken, setPreviousPageToken] = useState<string | undefined>(undefined);
const genRef = useRef(0);
const loadMoreInflightRef = useRef(false);
const hasMoreRef = useRef(false);
- const agentsLenRef = useRef(0);
+ const nextPageTokenRef = useRef<string | undefined>(undefined);
const listElRef = useRef<HTMLElement | null>(null);
const sentinelElRef = useRef<HTMLElement | null>(null);
const [listEl, setListEl] = useState<HTMLElement | null>(null);
@@ -131,7 +143,7 @@ export function useSearchAgentsList({
const limit = mode === 'paged' ? pageSize : clampPageSize(limitOption);
hasMoreRef.current = hasMore;
- agentsLenRef.current = agents.length;
+ nextPageTokenRef.current = nextPageToken;
const listRef = useCallback((node: HTMLElement | null) => {
listElRef.current = node;
@@ -148,7 +160,7 @@ export function useSearchAgentsList({
// Reset to first page when the query or catalog epoch changes.
useEffect(() => {
if (mode !== 'paged') return;
- setOffset(0);
+ setPageToken(undefined);
}, [mode, searchQuery, refreshKey]);
useEffect(() => {
@@ -159,18 +171,26 @@ export function useSearchAgentsList({
setLoading(true);
setError(null);
- const fetchOffset = mode === 'paged' ? offset : 0;
+ const fetchToken = mode === 'paged' ? pageToken : undefined;
void server
- .searchAgents({ query: searchQuery, limit, offset: fetchOffset })
- .then(rows => {
+ .searchAgents({
+ query: searchQuery,
+ limit,
+ ...(fetchToken === undefined || fetchToken === '' ? {} : { pageToken: fetchToken }),
+ })
+ .then(page => {
if (gen !== genRef.current) return;
- setAgents(rows);
- setHasMore(rows.length >= limit);
+ setAgents(page.data);
+ setNextPageToken(page.nextPageToken);
+ setPreviousPageToken(page.previousPageToken);
+ setHasMore(page.nextPageToken != null && page.nextPageToken !== '');
})
.catch((err: unknown) => {
if (gen !== genRef.current) return;
setAgents([]);
+ setNextPageToken(undefined);
+ setPreviousPageToken(undefined);
setHasMore(false);
setError(getErrorMessage(err, 'Failed to load agents.'));
})
@@ -181,25 +201,34 @@ export function useSearchAgentsList({
return () => {
genRef.current += 1;
};
- }, [enabled, server, searchQuery, limit, refreshKey, mode, offset]);
+ }, [enabled, server, searchQuery, limit, refreshKey, mode, pageToken]);
const loadMore = useCallback(() => {
if (mode !== 'infinite') return;
- if (!enabled || server == null || !hasMoreRef.current || loadMoreInflightRef.current || loading) {
+ const token = nextPageTokenRef.current;
+ if (
+ !enabled ||
+ server == null ||
+ !hasMoreRef.current ||
+ token == null ||
+ token === '' ||
+ loadMoreInflightRef.current ||
+ loading
+ ) {
return;
}
const gen = genRef.current;
- const nextOffset = agentsLenRef.current;
loadMoreInflightRef.current = true;
setLoadingMore(true);
void server
- .searchAgents({ query: searchQuery, limit, offset: nextOffset })
- .then(rows => {
+ .searchAgents({ query: searchQuery, limit, pageToken: token })
+ .then(page => {
if (gen !== genRef.current) return;
- setAgents(prev => [...prev, ...rows]);
- setHasMore(rows.length >= limit);
+ setAgents(prev => [...prev, ...page.data]);
+ setNextPageToken(page.nextPageToken);
+ setHasMore(page.nextPageToken != null && page.nextPageToken !== '');
})
.catch(() => {
if (gen !== genRef.current) return;
@@ -228,18 +257,20 @@ export function useSearchAgentsList({
const setPageSize = useCallback((size: number) => {
setPageSizeState(clampPageSize(size));
- setOffset(0);
+ setPageToken(undefined);
}, []);
const goNext = useCallback(() => {
- if (mode !== 'paged' || !hasMoreRef.current || loading) return;
- setOffset(current => current + pageSize);
- }, [mode, loading, pageSize]);
+ if (mode !== 'paged' || loading) return;
+ const token = nextPageTokenRef.current;
+ if (token == null || token === '') return;
+ setPageToken(token);
+ }, [mode, loading]);
const goPrev = useCallback(() => {
if (mode !== 'paged' || loading) return;
- setOffset(current => Math.max(0, current - pageSize));
- }, [mode, loading, pageSize]);
+ setPageToken(previousPageToken === undefined || previousPageToken === '' ? undefined : previousPageToken);
+ }, [mode, loading, previousPageToken]);
return {
agents,
@@ -252,8 +283,8 @@ export function useSearchAgentsList({
sentinelRef,
pageSize,
setPageSize,
- canPrev: mode === 'paged' && offset > 0,
- canNext: mode === 'paged' && hasMore,
+ canPrev: mode === 'paged' && previousPageToken != null && previousPageToken !== '',
+ canNext: mode === 'paged' && nextPageToken != null && nextPageToken !== '',
goPrev,
goNext,
};
diff --git a/packages/trueforge-ui/src/atoms/schedules/SchedulesPage.tsx b/packages/trueforge-ui/src/atoms/schedules/SchedulesPage.tsx
index a1d38f420..7420dbd8c 100644
--- a/packages/trueforge-ui/src/atoms/schedules/SchedulesPage.tsx
+++ b/packages/trueforge-ui/src/atoms/schedules/SchedulesPage.tsx
@@ -188,7 +188,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
const [pageSize, setPageSize] = useState(() => clampPageSize(DEFAULT_TABLE_PAGE_SIZE));
const [pageToken, setPageToken] = useState<string | undefined>(undefined);
const [nextPageToken, setNextPageToken] = useState<string | undefined>(undefined);
- const [prevTokenStack, setPrevTokenStack] = useState<string[]>([]);
+ const [previousPageToken, setPreviousPageToken] = useState<string | undefined>(undefined);
const loadGenRef = useRef(0);
const didConsumeIsNewRef = useRef(false);
@@ -234,6 +234,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
if (gen !== loadGenRef.current) return;
setSchedules(page.data);
setNextPageToken(page.nextPageToken);
+ setPreviousPageToken(page.previousPageToken);
void loadRunsForSchedules({ rows: page.data, gen });
} catch (caught) {
if (gen !== loadGenRef.current) return;
@@ -242,6 +243,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
setSchedules([]);
setRunsByScheduleId({});
setNextPageToken(undefined);
+ setPreviousPageToken(undefined);
} finally {
if (gen === loadGenRef.current) setLoading(false);
}
@@ -254,7 +256,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
const size = next?.size ?? pageSize;
const agentId = next?.agentId ?? agentFilter;
setPageToken(undefined);
- setPrevTokenStack([]);
+ setPreviousPageToken(undefined);
void loadSchedules({ token: undefined, size, agentId });
},
[agentFilter, loadSchedules, pageSize],
@@ -274,7 +276,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
setAgentFilter(current => {
if (current === agentId) return current;
setPageToken(undefined);
- setPrevTokenStack([]);
+ setPreviousPageToken(undefined);
return agentId;
});
}, [agentId]);
@@ -297,7 +299,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
const nextAgentFilter = agentId ?? next.agentFilter;
if (current === nextAgentFilter) return current;
setPageToken(undefined);
- setPrevTokenStack([]);
+ setPreviousPageToken(undefined);
return nextAgentFilter;
});
};
@@ -323,7 +325,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
// Key off page data, not client filters — filtering must not toggle the column.
const showCreatedByColumn = hasCreatedBySubject(schedules);
- const hasPageNav = prevTokenStack.length > 0 || nextPageToken != null;
+ const hasPageNav = previousPageToken != null || nextPageToken != null;
const handleTogglePause = async (schedule: Schedule) => {
if (!allows(schedule.id, 'MANAGE')) return;
@@ -368,16 +370,12 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
const goNext = () => {
if (nextPageToken == null) return;
- setPrevTokenStack(stack => [...stack, pageToken ?? '']);
setPageToken(nextPageToken);
};
const goPrev = () => {
- if (prevTokenStack.length === 0) return;
- const stack = [...prevTokenStack];
- const prev = stack.pop();
- setPrevTokenStack(stack);
- setPageToken(prev === '' ? undefined : prev);
+ if (previousPageToken == null || previousPageToken === '') return;
+ setPageToken(previousPageToken);
};
return (
@@ -403,7 +401,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
onValueChange={value => {
setAgentFilter(value);
setPageToken(undefined);
- setPrevTokenStack([]);
+ setPreviousPageToken(undefined);
}}
onAgentPicked={agent => {
setAgentLabelById(current => ({
@@ -453,7 +451,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
<TableTokenPagination
pageSize={pageSize}
rowCount={0}
- canPrev={prevTokenStack.length > 0}
+ canPrev={previousPageToken != null}
canNext={nextPageToken != null}
onPrev={goPrev}
onNext={goNext}
@@ -462,7 +460,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
const next = clampPageSize(size);
setPageSize(next);
setPageToken(undefined);
- setPrevTokenStack([]);
+ setPreviousPageToken(undefined);
}}
/>
) : null}
@@ -546,7 +544,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
<TableTokenPagination
pageSize={pageSize}
rowCount={filtered.length}
- canPrev={prevTokenStack.length > 0}
+ canPrev={previousPageToken != null}
canNext={nextPageToken != null}
onPrev={goPrev}
onNext={goNext}
@@ -555,7 +553,7 @@ export function SchedulesPage({ agentId }: SchedulesPageProps) {
const next = clampPageSize(size);
setPageSize(next);
setPageToken(undefined);
- setPrevTokenStack([]);
+ setPreviousPageToken(undefined);
}}
/>
)}
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentsList.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentsList.ts
index eea191667..7ea3c1099 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentsList.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentsList.ts
@@ -3,6 +3,9 @@
*/
import type { TrueForge, TrueForgeApi } from '@truefoundry/trueforge-sdk';
+import type { ListResult } from '../../server/types.js';
+import { toListResult } from './chatServer.js';
+
/** Matches API AGENTS_PAGE_DEFAULT / AGENTS_PAGE_LIMIT. */
export const AGENTS_PAGE_DEFAULT = 50;
export const AGENTS_PAGE_LIMIT = 100;
@@ -11,44 +14,40 @@ export function clampAgentsPageSize(size: number): number {
return Math.min(Math.max(size, 1), AGENTS_PAGE_LIMIT);
}
-/**
- * One page of agents. `offset` must be a multiple of `limit` (page-aligned);
- * advances via SDK `getNextPage` so we never invent page tokens.
- */
+/** One page of agents, with API next/previous page tokens. */
export async function listAgentsPage({
client,
limit,
- offset = 0,
+ pageToken,
agentName,
}: {
client: TrueForge;
limit: number;
- offset?: number;
+ pageToken?: string;
agentName?: string;
-}): Promise<TrueForgeApi.Agent[]> {
+}): Promise<ListResult<TrueForgeApi.Agent>> {
const pageSize = clampAgentsPageSize(limit);
- const start = Math.max(0, offset);
const page = await client.agents.list({
limit: pageSize,
+ ...(pageToken === undefined || pageToken === '' ? {} : { pageToken }),
...(agentName === undefined ? {} : { agentName }),
});
- let at = 0;
- while (at < start) {
- if (!page.hasNextPage()) return [];
- await page.getNextPage();
- at += pageSize;
- }
- return [...page.data];
+ return toListResult(page, agent => agent);
}
/** Drain every agents page into one array (name lookups, indexes). */
export async function drainAgentsList(client: TrueForge): Promise<TrueForgeApi.Agent[]> {
const items: TrueForgeApi.Agent[] = [];
- const page = await client.agents.list({ limit: AGENTS_PAGE_DEFAULT });
+ let pageToken: string | undefined;
for (;;) {
+ const page = await listAgentsPage({
+ client,
+ limit: AGENTS_PAGE_DEFAULT,
+ ...(pageToken === undefined ? {} : { pageToken }),
+ });
items.push(...page.data);
- if (!page.hasNextPage()) break;
- await page.getNextPage();
+ if (page.nextPageToken == null || page.nextPageToken === '') break;
+ pageToken = page.nextPageToken;
}
return items;
}
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
index bdc4bfc30..93e5dcb95 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
@@ -123,15 +123,18 @@ export function createHarnessBuilderServer(
async searchAgents(req?: SearchAgentsParams) {
const limit = clampAgentsPageSize(req?.limit ?? AGENTS_PAGE_DEFAULT);
- const offset = req?.offset ?? 0;
const query = req?.query?.trim();
- const rows = await listAgentsPage({
+ const page = await listAgentsPage({
client,
limit,
- offset,
+ ...(req?.pageToken === undefined || req.pageToken === '' ? {} : { pageToken: req.pageToken }),
...(query === undefined || query === '' ? {} : { agentName: query }),
});
- return rows.map(toLibraryEntry);
+ return {
+ data: page.data.map(toLibraryEntry),
+ ...(page.nextPageToken === undefined ? {} : { nextPageToken: page.nextPageToken }),
+ ...(page.previousPageToken === undefined ? {} : { previousPageToken: page.previousPageToken }),
+ };
},
async saveAgent({ agentName, description: descriptionRaw, agentSpec, intent }) {
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
index 38f21f8b4..5ad82436f 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
@@ -2,7 +2,7 @@
* Harness `AgentChatServer` adapter for @truefoundry/trueforge-ui.
*
* Runtime contract: opaque mounts (`object`), flat `ListResult` (`data` +
- * `nextPageToken`), and `null` normalized to absent. Harness keys MCP mounts by
+ * page tokens), and `null` normalized to absent. Harness keys MCP mounts by
* name and returns `null` for optional fields — the maps below bridge both.
*
* Skills are name (+ optional preload) refs on the wire (`Skill`).
@@ -137,10 +137,12 @@ export function toListResult<TSource, TResult>(
const mapped = map(item);
if (mapped !== undefined) data.push(mapped);
}
- const token = page.response.pagination.nextPageToken;
+ const next = page.response.pagination.nextPageToken;
+ const previous = page.response.pagination.previousPageToken;
return {
data,
- ...(token === undefined ? {} : { nextPageToken: token }),
+ ...(next === undefined ? {} : { nextPageToken: next }),
+ ...(previous === undefined ? {} : { previousPageToken: previous }),
};
}
diff --git a/packages/trueforge-ui/src/server/createTrueForgeServer.ts b/packages/trueforge-ui/src/server/createTrueForgeServer.ts
index 47d53f29c..b37753406 100644
--- a/packages/trueforge-ui/src/server/createTrueForgeServer.ts
+++ b/packages/trueforge-ui/src/server/createTrueForgeServer.ts
@@ -9,6 +9,7 @@ import type {
AgentSpec,
CatalogServer,
ConnectorState,
+ ListResult,
ModelSelection,
PermissionsServer,
SaveAgentRequest,
@@ -39,7 +40,7 @@ export type CreateTrueForgeServerOptions<
getMcp: () => Promise<TMcp[]>;
getMcpConnector?: AgentBuilderServer<TSpec, TModel, TSkill, TMcp, TAgent, TSave, TCapabilities>['getMcpConnector'];
getMcpTools?: AgentBuilderServer<TSpec, TModel, TSkill, TMcp, TAgent, TSave, TCapabilities>['getMcpTools'];
- searchAgents: (req?: SearchAgentsParams) => Promise<TAgent[]>;
+ searchAgents: (req?: SearchAgentsParams) => Promise<ListResult<TAgent>>;
saveAgent: (req: SaveAgentRequest<TSpec>) => Promise<TSave>;
deleteAgent?: (req: { agentName: string }) => Promise<void>;
/** Settings catalog (models + connectors). Optional. */
diff --git a/packages/trueforge-ui/test/atoms/AgentHistoryFilterButton.test.tsx b/packages/trueforge-ui/test/atoms/AgentHistoryFilterButton.test.tsx
index 3d9e9660c..7851a1ea6 100644
--- a/packages/trueforge-ui/test/atoms/AgentHistoryFilterButton.test.tsx
+++ b/packages/trueforge-ui/test/atoms/AgentHistoryFilterButton.test.tsx
@@ -31,10 +31,12 @@ beforeEach(() => {
function mockServer(partial: Partial<AgentUIServer> = {}): AgentUIServer {
return createMockAgentUIServer({
- searchAgents: async () => [
- { name: 'From SDK', agentId: 'from-sdk' },
- { name: 'Other', agentId: 'other' },
- ],
+ searchAgents: async () => ({
+ data: [
+ { name: 'From SDK', agentId: 'from-sdk' },
+ { name: 'Other', agentId: 'other' },
+ ],
+ }),
...partial,
});
}
@@ -98,10 +100,12 @@ describe('AgentHistoryFilterButton', () => {
});
it('opens popover and sets history filter on agent click', async () => {
- const searchAgents = vi.fn(async () => [
- { name: 'From SDK', agentId: 'from-sdk' },
- { name: 'Other', agentId: 'other' },
- ]);
+ const searchAgents = vi.fn(async () => ({
+ data: [
+ { name: 'From SDK', agentId: 'from-sdk' },
+ { name: 'Other', agentId: 'other' },
+ ],
+ }));
const server = mockServer({ searchAgents });
render(<AgentHistoryFilterButton />, {
wrapper: wrap({ agentConfig: { mode: 'AgentLibraryWithComposer' }, server }),
@@ -144,7 +148,8 @@ describe('AgentHistoryFilterButton', () => {
{ name: 'From SDK', agentId: 'from-sdk' },
{ name: 'Other', agentId: 'other' },
];
- return q === '' ? all : all.filter(a => a.name.toLowerCase().includes(q));
+ const data = q === '' ? all : all.filter(a => a.name.toLowerCase().includes(q));
+ return { data };
});
const server = mockServer({ searchAgents });
render(<AgentHistoryFilterButton />, {
@@ -165,8 +170,8 @@ describe('AgentHistoryFilterButton', () => {
it('shows an empty banner and keeps list min-height when search matches nothing', async () => {
const searchAgents = vi.fn(async (req?: { query?: string }) => {
const q = req?.query?.trim().toLowerCase() ?? '';
- if (q === '') return [{ name: 'From SDK', agentId: 'from-sdk' }];
- return [];
+ if (q === '') return { data: [{ name: 'From SDK', agentId: 'from-sdk' }] };
+ return { data: [] };
});
const server = mockServer({ searchAgents });
render(<AgentHistoryFilterButton />, {
diff --git a/packages/trueforge-ui/test/atoms/AgentSearchPicker.test.tsx b/packages/trueforge-ui/test/atoms/AgentSearchPicker.test.tsx
index fcbb399dc..cbca91d52 100644
--- a/packages/trueforge-ui/test/atoms/AgentSearchPicker.test.tsx
+++ b/packages/trueforge-ui/test/atoms/AgentSearchPicker.test.tsx
@@ -31,8 +31,8 @@ describe('AgentSearchPicker', () => {
{ name: 'alpha-bot', agentId: 'alpha-bot' },
{ name: 'beta-bot', agentId: 'beta-bot' },
];
- if (query == null || query === '') return agents;
- return agents.filter(agent => agent.name.includes(query));
+ if (query == null || query === '') return { data: agents };
+ return { data: agents.filter(agent => agent.name.includes(query)) };
});
const onValueChange = vi.fn();
const onAgentPicked = vi.fn();
@@ -82,8 +82,8 @@ describe('AgentSearchPicker', () => {
{ name: 'alpha-bot', agentId: 'alpha-bot' },
{ name: 'beta-bot', agentId: 'beta-bot' },
];
- if (query == null || query === '') return agents;
- return agents.filter(agent => agent.name.includes(query));
+ if (query == null || query === '') return { data: agents };
+ return { data: agents.filter(agent => agent.name.includes(query)) };
});
const onValueChange = vi.fn();
@@ -127,7 +127,7 @@ describe('AgentSearchPicker', () => {
{
wrapper: wrap(
createMockAgentUIServer({
- searchAgents: vi.fn(async () => [{ name: 'alpha-bot', agentId: 'alpha-bot' }]),
+ searchAgents: vi.fn(async () => ({ data: [{ name: 'alpha-bot', agentId: 'alpha-bot' }] })),
}),
),
},
diff --git a/packages/trueforge-ui/test/atoms/AgentSessionsFilters.test.tsx b/packages/trueforge-ui/test/atoms/AgentSessionsFilters.test.tsx
index 203dd6551..b40f672fa 100644
--- a/packages/trueforge-ui/test/atoms/AgentSessionsFilters.test.tsx
+++ b/packages/trueforge-ui/test/atoms/AgentSessionsFilters.test.tsx
@@ -18,7 +18,9 @@ describe('AgentSessionsFilters', () => {
{ agentId: 'alpha-agent', name: 'Alpha agent' },
{ agentId: 'beta-agent', name: 'Beta agent' },
];
- return query == null ? agents : agents.filter(agent => agent.name.toLowerCase().includes(query.toLowerCase()));
+ return {
+ data: query == null ? agents : agents.filter(agent => agent.name.toLowerCase().includes(query.toLowerCase())),
+ };
});
const onAgentChange = vi.fn();
@@ -52,7 +54,7 @@ describe('AgentSessionsFilters', () => {
});
it('resolves the selected agent name after a refresh', async () => {
- const searchAgents = vi.fn(async () => [{ agentId: 'agent-id', name: 'Agent name' }]);
+ const searchAgents = vi.fn(async () => ({ data: [{ agentId: 'agent-id', name: 'Agent name' }] }));
render(
<ServerProvider server={createMockAgentUIServer({ searchAgents })}>
diff --git a/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx b/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
index 346bed645..ad7c5999c 100644
--- a/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
+++ b/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
@@ -49,7 +49,7 @@ function mockServer(
}> = [{ name: 'alpha-agent', agentId: 'alpha-agent' }],
): AgentUIServer {
return createMockAgentUIServer({
- searchAgents: vi.fn(async () => agents),
+ searchAgents: vi.fn(async () => ({ data: agents })),
});
}
@@ -121,7 +121,7 @@ describe('AgentsLibrary', () => {
it('opens agent details from the row only when the optional server is available', async () => {
window.history.replaceState(null, '', '/library?theme=dark&sessionId=stale&view=sessions&s_sts=1&s_ets=2');
const server = createMockAgentUIServer({
- searchAgents: vi.fn(async () => [{ name: 'alpha-agent', agentId: 'agent-1' }]),
+ searchAgents: vi.fn(async () => ({ data: [{ name: 'alpha-agent', agentId: 'agent-1' }] })),
sessions: {
getAgent: vi.fn(),
getCodeSnippets: vi.fn(),
@@ -234,13 +234,15 @@ describe('AgentsLibrary', () => {
it('keeps Try and Clone available with USE while disabling Edit and Delete', async () => {
const server = createMockAgentUIServer({
- searchAgents: vi.fn(async () => [
- {
- name: 'shared-agent',
- agentId: 'shared-id',
- agentSpec: { model: { name: 'openai/gpt-5' } },
- },
- ]),
+ searchAgents: vi.fn(async () => ({
+ data: [
+ {
+ name: 'shared-agent',
+ agentId: 'shared-id',
+ agentSpec: { model: { name: 'openai/gpt-5' } },
+ },
+ ],
+ })),
permissions: {
listPermissions: vi.fn(async ({ resourceType }): Promise<ListPermissionsResponse> =>
resourceType === 'tenant'
@@ -273,13 +275,15 @@ describe('AgentsLibrary', () => {
it('keeps Clone enabled without USE (read-only agent permissions)', async () => {
const server = createMockAgentUIServer({
- searchAgents: vi.fn(async () => [
- {
- name: 'shared-agent',
- agentId: 'shared-id',
- agentSpec: { model: { name: 'openai/gpt-5' } },
- },
- ]),
+ searchAgents: vi.fn(async () => ({
+ data: [
+ {
+ name: 'shared-agent',
+ agentId: 'shared-id',
+ agentSpec: { model: { name: 'openai/gpt-5' } },
+ },
+ ],
+ })),
permissions: {
listPermissions: vi.fn(async ({ resourceType }): Promise<ListPermissionsResponse> =>
resourceType === 'tenant'
@@ -308,14 +312,16 @@ describe('AgentsLibrary', () => {
it('opens Clone Agent drawer on Clone, creates on save, and stays on the library', async () => {
const saveAgent = vi.fn(async () => ({ agentId: 'writer-clone-id' }));
const server = createMockAgentUIServer({
- searchAgents: vi.fn(async () => [
- {
- name: 'writer',
- agentId: 'writer-id',
- description: 'Writes release notes.',
- agentSpec: { model: { name: 'openai-main/gpt-4.1' } },
- },
- ]),
+ searchAgents: vi.fn(async () => ({
+ data: [
+ {
+ name: 'writer',
+ agentId: 'writer-id',
+ description: 'Writes release notes.',
+ agentSpec: { model: { name: 'openai-main/gpt-4.1' } },
+ },
+ ],
+ })),
saveAgent,
deleteAgent: vi.fn(async () => {}),
});
@@ -353,13 +359,15 @@ describe('AgentsLibrary', () => {
it('deletes an agent only after the confirmation dialog is accepted', async () => {
const deleteAgent = vi.fn(async () => {});
const server = createMockAgentUIServer({
- searchAgents: vi.fn(async () => [
- {
- name: 'writer',
- agentId: 'writer-id',
- agentSpec: { model: { name: 'openai-main/gpt-4.1' } },
- },
- ]),
+ searchAgents: vi.fn(async () => ({
+ data: [
+ {
+ name: 'writer',
+ agentId: 'writer-id',
+ agentSpec: { model: { name: 'openai-main/gpt-4.1' } },
+ },
+ ],
+ })),
deleteAgent,
});
@@ -508,11 +516,13 @@ describe('AgentsLibraryButton', () => {
it('re-fetches the agent count when agentsListEpoch bumps', async () => {
const searchAgents = vi
.fn()
- .mockResolvedValueOnce([{ name: 'alpha', agentId: 'alpha' }])
- .mockResolvedValueOnce([
- { name: 'alpha', agentId: 'alpha' },
- { name: 'beta', agentId: 'beta' },
- ]);
+ .mockResolvedValueOnce({ data: [{ name: 'alpha', agentId: 'alpha' }] })
+ .mockResolvedValueOnce({
+ data: [
+ { name: 'alpha', agentId: 'alpha' },
+ { name: 'beta', agentId: 'beta' },
+ ],
+ });
const server = createMockAgentUIServer({ searchAgents });
function Invalidate() {
@@ -544,12 +554,14 @@ describe('AgentsLibraryButton', () => {
expect(searchAgents).toHaveBeenCalledTimes(2);
});
- it('shows 50+ when the first page is full', async () => {
+ it('shows 50+ when the first page has a next token', async () => {
const agents = Array.from({ length: 50 }, (_, i) => ({
name: `agent-${i}`,
agentId: `agent-${i}`,
}));
- const server = mockServer(agents);
+ const server = createMockAgentUIServer({
+ searchAgents: vi.fn(async () => ({ data: agents, nextPageToken: 'tok_2' })),
+ });
renderLibrary(<AgentsLibraryButton />, { server });
@@ -559,7 +571,7 @@ describe('AgentsLibraryButton', () => {
});
it('does not fetch agent count when compact', () => {
- const searchAgents = vi.fn(async () => [{ name: 'alpha', agentId: 'alpha' }]);
+ const searchAgents = vi.fn(async () => ({ data: [{ name: 'alpha', agentId: 'alpha' }] }));
const server = createMockAgentUIServer({ searchAgents });
renderLibrary(<AgentsLibraryButton compact />, { server });
@@ -596,10 +608,12 @@ describe('AgentsLibraryButton', () => {
],
}));
const server = createMockAgentUIServer({
- searchAgents: vi.fn(async () => [
- { name: 'alpha-agent', agentId: 'alpha-agent' },
- { name: 'beta-agent', agentId: 'beta-agent' },
- ]),
+ searchAgents: vi.fn(async () => ({
+ data: [
+ { name: 'alpha-agent', agentId: 'alpha-agent' },
+ { name: 'beta-agent', agentId: 'beta-agent' },
+ ],
+ })),
sessions: {
getAgent: vi.fn(),
getCodeSnippets: vi.fn(),
@@ -671,7 +685,7 @@ describe('AgentsLibraryButton', () => {
return { data: [] };
});
const server = createMockAgentUIServer({
- searchAgents: vi.fn(async () => [{ name: 'alpha-agent', agentId: 'alpha-agent' }]),
+ searchAgents: vi.fn(async () => ({ data: [{ name: 'alpha-agent', agentId: 'alpha-agent' }] })),
schedules: {
listSchedules,
getSchedule: vi.fn(),
@@ -703,27 +717,34 @@ describe('AgentsLibraryButton', () => {
expect(screen.getByRole('button', { name: 'Previous page' })).toBeDisabled();
});
- it('paginates with next and previous and resets offset when page size changes', async () => {
+ it('paginates with next and previous and resets page token when page size changes', async () => {
const all = Array.from({ length: 15 }, (_, i) => ({
name: `agent-${String(i).padStart(2, '0')}`,
agentId: `agent-${i}`,
}));
- const searchAgents = vi.fn(async ({ limit = 10, offset = 0 }: { limit?: number; offset?: number } = {}) =>
- all.slice(offset, offset + limit),
- );
+ const searchAgents = vi.fn(async ({ limit = 10, pageToken }: { limit?: number; pageToken?: string } = {}) => {
+ if (pageToken === 'tok_2') {
+ return { data: all.slice(10), previousPageToken: 'tok_1' };
+ }
+ const data = all.slice(0, limit);
+ return {
+ data,
+ ...(data.length < all.length ? { nextPageToken: 'tok_2' } : {}),
+ };
+ });
const server = createMockAgentUIServer({ searchAgents });
renderLibrary(<LibraryHarness />, { server });
fireEvent.click(screen.getByRole('button', { name: 'Open library' }));
await screen.findByRole('button', { name: 'Try agent agent-00' });
- expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 10, offset: 0 });
+ expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 10 });
expect(screen.getByRole('button', { name: 'Next page' })).toBeEnabled();
expect(screen.getByRole('button', { name: 'Previous page' })).toBeDisabled();
fireEvent.click(screen.getByRole('button', { name: 'Next page' }));
await waitFor(() => {
- expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 10, offset: 10 });
+ expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 10, pageToken: 'tok_2' });
});
await screen.findByRole('button', { name: 'Try agent agent-10' });
expect(screen.getByRole('button', { name: 'Previous page' })).toBeEnabled();
@@ -731,20 +752,20 @@ describe('AgentsLibraryButton', () => {
fireEvent.click(screen.getByRole('button', { name: 'Previous page' }));
await waitFor(() => {
- expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 10, offset: 0 });
+ expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 10, pageToken: 'tok_1' });
});
await screen.findByRole('button', { name: 'Try agent agent-00' });
fireEvent.click(screen.getByRole('button', { name: 'Next page' }));
await waitFor(() => {
- expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 10, offset: 10 });
+ expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 10, pageToken: 'tok_2' });
});
// PopoverSelect: open rows-per-page and pick 25
fireEvent.click(screen.getByRole('button', { name: 'Rows per page' }));
fireEvent.click(await screen.findByRole('option', { name: '25' }));
await waitFor(() => {
- expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 25, offset: 0 });
+ expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 25 });
});
});
diff --git a/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsx b/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsx
index 95b3c6240..48e97ad48 100644
--- a/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsx
+++ b/packages/trueforge-ui/test/atoms/ClearChatButton.test.tsx
@@ -22,7 +22,7 @@ const startedMessages = [{ role: 'user' as const, content: 'hello', id: 'm1' }];
function mockServer() {
return createMockAgentUIServer({
- searchAgents: vi.fn(async () => [{ name: 'alpha', agentId: 'alpha' }]),
+ searchAgents: vi.fn(async () => ({ data: [{ name: 'alpha', agentId: 'alpha' }] })),
});
}
diff --git a/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx b/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
index a0190ec1c..eb2b56ee0 100644
--- a/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
+++ b/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
@@ -110,9 +110,9 @@ function renderPage({
} = {}) {
const server = createMockAgentUIServer({
getSession,
- searchAgents: vi.fn(async () => [
- { agentId: 'agent-1', name: 'release-notes-writer', agentSpec: { model: { name: 'openai/gpt-5.1' } } },
- ]),
+ searchAgents: vi.fn(async () => ({
+ data: [{ agentId: 'agent-1', name: 'release-notes-writer', agentSpec: { model: { name: 'openai/gpt-5.1' } } }],
+ })),
sessions: { getAgent: vi.fn(), getCodeSnippets: vi.fn(), listSessions, listSessionEvents },
...(deleteSession == null ? {} : { deleteSession }),
...(permissions == null ? {} : { permissions }),
diff --git a/packages/trueforge-ui/test/atoms/lib/useSearchAgentsList.test.tsx b/packages/trueforge-ui/test/atoms/lib/useSearchAgentsList.test.tsx
index 5895aa8e3..a1e47a18b 100644
--- a/packages/trueforge-ui/test/atoms/lib/useSearchAgentsList.test.tsx
+++ b/packages/trueforge-ui/test/atoms/lib/useSearchAgentsList.test.tsx
@@ -31,8 +31,8 @@ describe('useSearchAgentsList', () => {
}));
const searchAgents = vi
.fn()
- .mockResolvedValueOnce(firstPage)
- .mockResolvedValueOnce([{ name: 'helper', agentId: 'helper-id' }]);
+ .mockResolvedValueOnce({ data: firstPage, nextPageToken: 'tok_2' })
+ .mockResolvedValueOnce({ data: [{ name: 'helper', agentId: 'helper-id' }] });
await expect(
findAgentByName({
@@ -43,7 +43,7 @@ describe('useSearchAgentsList', () => {
expect(searchAgents).toHaveBeenLastCalledWith({
query: 'helper',
limit: SEARCH_AGENTS_PAGE_SIZE,
- offset: SEARCH_AGENTS_PAGE_SIZE,
+ pageToken: 'tok_2',
});
});
@@ -54,8 +54,8 @@ describe('useSearchAgentsList', () => {
}));
const searchAgents = vi
.fn()
- .mockResolvedValueOnce(firstPage)
- .mockResolvedValueOnce([{ name: 'Demo Bot', agentId: 'agt_demo' }]);
+ .mockResolvedValueOnce({ data: firstPage, nextPageToken: 'tok_2' })
+ .mockResolvedValueOnce({ data: [{ name: 'Demo Bot', agentId: 'agt_demo' }] });
await expect(
findLibraryAgent({
@@ -65,7 +65,7 @@ describe('useSearchAgentsList', () => {
).resolves.toEqual({ name: 'Demo Bot', agentId: 'agt_demo' });
expect(searchAgents).toHaveBeenLastCalledWith({
limit: SEARCH_AGENTS_PAGE_SIZE,
- offset: SEARCH_AGENTS_PAGE_SIZE,
+ pageToken: 'tok_2',
});
});
@@ -75,7 +75,10 @@ describe('useSearchAgentsList', () => {
agentId: `agent-${i}`,
}));
const page2 = [{ name: 'agent-extra', agentId: 'agent-extra' }];
- const searchAgents = vi.fn().mockResolvedValueOnce(page1).mockResolvedValueOnce(page2);
+ const searchAgents = vi
+ .fn()
+ .mockResolvedValueOnce({ data: page1, nextPageToken: 'tok_2' })
+ .mockResolvedValueOnce({ data: page2 });
const server = createMockAgentUIServer({ searchAgents });
const { result } = renderHook(() => useSearchAgentsList({ enabled: true, query: '' }), {
@@ -84,7 +87,7 @@ describe('useSearchAgentsList', () => {
await waitFor(() => expect(result.current.agents).toHaveLength(SEARCH_AGENTS_PAGE_SIZE));
expect(result.current.hasMore).toBe(true);
- expect(searchAgents).toHaveBeenCalledWith({ query: undefined, limit: SEARCH_AGENTS_PAGE_SIZE, offset: 0 });
+ expect(searchAgents).toHaveBeenCalledWith({ query: undefined, limit: SEARCH_AGENTS_PAGE_SIZE });
const observers: IntersectionObserverCallback[] = [];
vi.stubGlobal(
@@ -126,16 +129,16 @@ describe('useSearchAgentsList', () => {
expect(searchAgents).toHaveBeenCalledWith({
query: undefined,
limit: SEARCH_AGENTS_PAGE_SIZE,
- offset: SEARCH_AGENTS_PAGE_SIZE,
+ pageToken: 'tok_2',
});
expect(result.current.hasMore).toBe(false);
});
it('debounces query changes before re-fetching', async () => {
vi.useFakeTimers();
- const searchAgents = vi.fn(async ({ query }: { query?: string } = {}) => [
- { name: query ?? 'all', agentId: query ?? 'all' },
- ]);
+ const searchAgents = vi.fn(async ({ query }: { query?: string } = {}) => ({
+ data: [{ name: query ?? 'all', agentId: query ?? 'all' }],
+ }));
const server = createMockAgentUIServer({ searchAgents });
const { result, rerender } = renderHook(
@@ -159,17 +162,21 @@ describe('useSearchAgentsList', () => {
await Promise.resolve();
});
expect(searchAgents).toHaveBeenCalledTimes(2);
- expect(searchAgents).toHaveBeenLastCalledWith({ query: 'alpha', limit: SEARCH_AGENTS_PAGE_SIZE, offset: 0 });
+ expect(searchAgents).toHaveBeenLastCalledWith({ query: 'alpha', limit: SEARCH_AGENTS_PAGE_SIZE });
expect(result.current.agents).toEqual([{ name: 'alpha', agentId: 'alpha' } satisfies AgentLibraryEntry]);
});
- it('paged mode replaces rows and navigates by offset', async () => {
+ it('paged mode replaces rows and navigates by page tokens', async () => {
const page1 = Array.from({ length: 10 }, (_, i) => ({
name: `agent-${i}`,
agentId: `agent-${i}`,
}));
const page2 = [{ name: 'agent-10', agentId: 'agent-10' }];
- const searchAgents = vi.fn().mockResolvedValueOnce(page1).mockResolvedValueOnce(page2).mockResolvedValueOnce(page1);
+ const searchAgents = vi
+ .fn()
+ .mockResolvedValueOnce({ data: page1, nextPageToken: 'tok_2' })
+ .mockResolvedValueOnce({ data: page2, previousPageToken: 'tok_1' })
+ .mockResolvedValueOnce({ data: page1, nextPageToken: 'tok_2' });
const server = createMockAgentUIServer({ searchAgents });
const { result } = renderHook(() => useSearchAgentsList({ enabled: true, query: '', mode: 'paged', limit: 10 }), {
@@ -179,13 +186,13 @@ describe('useSearchAgentsList', () => {
await waitFor(() => expect(result.current.agents).toHaveLength(10));
expect(result.current.canNext).toBe(true);
expect(result.current.canPrev).toBe(false);
- expect(searchAgents).toHaveBeenCalledWith({ query: undefined, limit: 10, offset: 0 });
+ expect(searchAgents).toHaveBeenCalledWith({ query: undefined, limit: 10 });
act(() => {
result.current.goNext();
});
await waitFor(() => expect(result.current.agents).toEqual(page2));
- expect(searchAgents).toHaveBeenCalledWith({ query: undefined, limit: 10, offset: 10 });
+ expect(searchAgents).toHaveBeenCalledWith({ query: undefined, limit: 10, pageToken: 'tok_2' });
expect(result.current.canPrev).toBe(true);
expect(result.current.canNext).toBe(false);
@@ -193,6 +200,22 @@ describe('useSearchAgentsList', () => {
result.current.goPrev();
});
await waitFor(() => expect(result.current.agents).toHaveLength(10));
- expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 10, offset: 0 });
+ expect(searchAgents).toHaveBeenLastCalledWith({ query: undefined, limit: 10, pageToken: 'tok_1' });
+ });
+
+ it('disables next when the only page is exactly full but has no next token', async () => {
+ const page = Array.from({ length: 10 }, (_, i) => ({
+ name: `agent-${i}`,
+ agentId: `agent-${i}`,
+ }));
+ const searchAgents = vi.fn().mockResolvedValue({ data: page });
+ const server = createMockAgentUIServer({ searchAgents });
+ const { result } = renderHook(() => useSearchAgentsList({ enabled: true, query: '', mode: 'paged', limit: 10 }), {
+ wrapper: wrapperFor(server),
+ });
+
+ await waitFor(() => expect(result.current.agents).toHaveLength(10));
+ expect(result.current.canNext).toBe(false);
+ expect(result.current.canPrev).toBe(false);
});
});
diff --git a/packages/trueforge-ui/test/atoms/schedules/ScheduleFormDrawer.test.tsx b/packages/trueforge-ui/test/atoms/schedules/ScheduleFormDrawer.test.tsx
index 9568b4635..17f53d274 100644
--- a/packages/trueforge-ui/test/atoms/schedules/ScheduleFormDrawer.test.tsx
+++ b/packages/trueforge-ui/test/atoms/schedules/ScheduleFormDrawer.test.tsx
@@ -102,16 +102,18 @@ function renderDrawer({
const agentServer =
server ??
createMockAgentUIServer({
- searchAgents: vi.fn(async () => [
- {
- name: 'demo-agent',
- agentId: 'demo-agent',
- agentSpec: {
- model: { name: 'openai/gpt-4.1' },
- mcpServers: [{ name: 'Slack 1234' }],
+ searchAgents: vi.fn(async () => ({
+ data: [
+ {
+ name: 'demo-agent',
+ agentId: 'demo-agent',
+ agentSpec: {
+ model: { name: 'openai/gpt-4.1' },
+ mcpServers: [{ name: 'Slack 1234' }],
+ },
},
- },
- ]),
+ ],
+ })),
getMcp: vi.fn(async () => [slackMcp]),
catalog: createMockCatalog({
connectorCatalog: {
@@ -177,8 +179,8 @@ describe('ScheduleFormDrawer', () => {
},
{ name: 'other-agent', agentId: 'other-agent' },
];
- if (query == null || query === '') return agents;
- return agents.filter(agent => agent.name.toLowerCase().includes(query.toLowerCase()));
+ if (query == null || query === '') return { data: agents };
+ return { data: agents.filter(agent => agent.name.toLowerCase().includes(query.toLowerCase())) };
});
renderDrawer({ server: createMockAgentUIServer({ searchAgents }) });
@@ -197,7 +199,7 @@ describe('ScheduleFormDrawer', () => {
it('offers to build an agent when none have been created', async () => {
const onOpenChange = vi.fn();
renderDrawer({
- server: createMockAgentUIServer({ searchAgents: vi.fn(async () => []) }),
+ server: createMockAgentUIServer({ searchAgents: vi.fn(async () => ({ data: [] })) }),
onOpenChange,
withShell: true,
});
@@ -365,16 +367,18 @@ describe('ScheduleFormDrawer', () => {
const getMcp = vi.fn(async () => [{ ...slackMcp, authenticated }]);
renderDrawer({
server: createMockAgentUIServer({
- searchAgents: vi.fn(async () => [
- {
- name: 'demo-agent',
- agentId: 'demo-agent',
- agentSpec: {
- model: { name: 'openai/gpt-4.1' },
- mcpServers: [{ name: 'Slack 1234' }],
+ searchAgents: vi.fn(async () => ({
+ data: [
+ {
+ name: 'demo-agent',
+ agentId: 'demo-agent',
+ agentSpec: {
+ model: { name: 'openai/gpt-4.1' },
+ mcpServers: [{ name: 'Slack 1234' }],
+ },
},
- },
- ]),
+ ],
+ })),
getMcp,
catalog: createMockCatalog({
connectorCatalog: {
@@ -461,16 +465,18 @@ describe('ScheduleFormDrawer', () => {
});
it('prefills create from an agent id that differs from the name', async () => {
- const searchAgents = vi.fn(async (_opts: { query?: string; limit?: number; offset?: number } = {}) => [
- {
- name: 'Demo Bot',
- agentId: 'agt_demo',
- agentSpec: {
- model: { name: 'openai/gpt-4.1' },
- mcpServers: [{ name: 'Slack 1234' }],
+ const searchAgents = vi.fn(async (_opts: { query?: string; limit?: number; pageToken?: string } = {}) => ({
+ data: [
+ {
+ name: 'Demo Bot',
+ agentId: 'agt_demo',
+ agentSpec: {
+ model: { name: 'openai/gpt-4.1' },
+ mcpServers: [{ name: 'Slack 1234' }],
+ },
},
- },
- ]);
+ ],
+ }));
renderDrawer({
server: createMockAgentUIServer({
searchAgents,
@@ -494,7 +500,7 @@ describe('ScheduleFormDrawer', () => {
await waitFor(() => {
expect(screen.getByRole('combobox', { name: 'Agent' })).toHaveValue('Demo Bot');
});
- expect(searchAgents).toHaveBeenCalledWith(expect.objectContaining({ limit: expect.any(Number), offset: 0 }));
+ expect(searchAgents).toHaveBeenCalledWith(expect.objectContaining({ limit: expect.any(Number) }));
expect(searchAgents.mock.calls.some(call => call[0]?.query != null)).toBe(false);
});
@@ -506,21 +512,25 @@ describe('ScheduleFormDrawer', () => {
const searchAgents = vi.fn(async ({ query }: { query?: string } = {}) => {
if (query == null || query === '') {
await prefillPromise;
- return [
+ return {
+ data: [
+ {
+ name: 'Prefill Bot',
+ agentId: 'agt_prefill',
+ agentSpec: { model: { name: 'openai/gpt-4.1' }, mcpServers: [] },
+ },
+ ],
+ };
+ }
+ return {
+ data: [
{
- name: 'Prefill Bot',
- agentId: 'agt_prefill',
+ name: 'Picked Bot',
+ agentId: 'agt_picked',
agentSpec: { model: { name: 'openai/gpt-4.1' }, mcpServers: [] },
},
- ];
- }
- return [
- {
- name: 'Picked Bot',
- agentId: 'agt_picked',
- agentSpec: { model: { name: 'openai/gpt-4.1' }, mcpServers: [] },
- },
- ];
+ ],
+ };
});
renderDrawer({
diff --git a/packages/trueforge-ui/test/atoms/schedules/SchedulesPage.test.tsx b/packages/trueforge-ui/test/atoms/schedules/SchedulesPage.test.tsx
index 3e3b70cde..2b4ed0078 100644
--- a/packages/trueforge-ui/test/atoms/schedules/SchedulesPage.test.tsx
+++ b/packages/trueforge-ui/test/atoms/schedules/SchedulesPage.test.tsx
@@ -86,7 +86,7 @@ function renderPage(
...overrides,
};
const server = createMockAgentUIServer({
- searchAgents: searchAgents ?? vi.fn(async () => [{ name: 'demo-agent', agentId: 'demo-agent' }]),
+ searchAgents: searchAgents ?? vi.fn(async () => ({ data: [{ name: 'demo-agent', agentId: 'demo-agent' }] })),
schedules: scheduleServer,
...(options.permissions == null ? {} : { permissions: options.permissions }),
});
@@ -221,6 +221,7 @@ describe('SchedulesPage', () => {
name: 'weekly-digest',
},
],
+ previousPageToken: 'page-1',
});
renderPage(sampleSchedules, {}, listSchedules);
@@ -231,6 +232,12 @@ describe('SchedulesPage', () => {
expect(listSchedules).toHaveBeenLastCalledWith(expect.objectContaining({ pageToken: 'page-2', limit: 10 }));
});
expect(await screen.findByText('weekly-digest')).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Previous page' })).toBeEnabled();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Previous page' }));
+ await waitFor(() => {
+ expect(listSchedules).toHaveBeenLastCalledWith(expect.objectContaining({ pageToken: 'page-1', limit: 10 }));
+ });
});
it('ignores run history returned for a stale schedules page', async () => {
@@ -463,12 +470,12 @@ describe('SchedulesPage', () => {
{ agentId: 'beta-agent', name: 'beta-agent' },
];
const searchAgents = vi.fn(
- async ({ query, limit = 50, offset = 0 }: { query?: string; limit?: number; offset?: number } = {}) => {
+ async ({ query, limit = 50 }: { query?: string; limit?: number; pageToken?: string } = {}) => {
const matched =
query == null || query === ''
? agents
: agents.filter(agent => agent.name.toLowerCase().includes(query.toLowerCase()));
- return matched.slice(offset, offset + limit);
+ return { data: matched.slice(0, limit) };
},
);
renderPage(sampleSchedules, {}, undefined, searchAgents);
diff --git a/packages/trueforge-ui/test/containers/ThreadListContainer.test.tsx b/packages/trueforge-ui/test/containers/ThreadListContainer.test.tsx
index 33b308c3d..b777e42d5 100644
--- a/packages/trueforge-ui/test/containers/ThreadListContainer.test.tsx
+++ b/packages/trueforge-ui/test/containers/ThreadListContainer.test.tsx
@@ -258,7 +258,7 @@ describe('ThreadListContainer', () => {
it('uses filter intent to distinguish Try Agent from a filtered agent session', () => {
const server = createMockAgentUIServer({
- searchAgents: async () => [{ name: 'Support Agent', agentId: 'support-id' }],
+ searchAgents: async () => ({ data: [{ name: 'Support Agent', agentId: 'support-id' }] }),
});
render(
diff --git a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
index a762004e2..75f2b78c3 100644
--- a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
+++ b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
@@ -345,8 +345,8 @@ describe('harnessBuilderServer', () => {
const builder = createHarnessBuilderServer({ fetch: fetchMock });
const all = await builder.searchAgents();
- assert.equal(all.length, 2);
- assert.deepEqual(all[0], {
+ assert.equal(all.data.length, 2);
+ assert.deepEqual(all.data[0], {
name: 'reviewer',
agentId: 'agt_1',
createdBySubject: {
@@ -365,13 +365,13 @@ describe('harnessBuilderServer', () => {
const filtered = await builder.searchAgents({ query: ' write ' });
assert.deepEqual(
- filtered.map(row => row.name),
+ filtered.data.map(row => row.name),
['writer'],
);
assert.deepEqual(requestedAgentNames, [null, 'write']);
});
- it('searchAgents advances offset via page_token on a later API page', async () => {
+ it('searchAgents advances via pageToken on a later API page', async () => {
const fetchMock: typeof fetch = async input => {
const url = String(input instanceof Request ? input.url : input);
const parsed = new URL(url);
@@ -392,18 +392,20 @@ describe('harnessBuilderServer', () => {
if (pageToken === 'tok_2') {
return Response.json({
data: [{ id: 'agt_2', name: 'beta', manifest: { model: { name: 'test/model' } } }],
- pagination: { limit: 1 },
+ pagination: { limit: 1, previous_page_token: 'tok_1' },
});
}
return new Response(`Unexpected page_token: ${pageToken}`, { status: 500 });
};
const builder = createHarnessBuilderServer({ fetch: fetchMock });
- const page = await builder.searchAgents({ query: 'a', limit: 1, offset: 1 });
+ const page = await builder.searchAgents({ query: 'a', limit: 1, pageToken: 'tok_2' });
assert.deepEqual(
- page.map(row => row.name),
+ page.data.map(row => row.name),
['beta'],
);
+ assert.equal(page.previousPageToken, 'tok_1');
+ assert.equal(page.nextPageToken, undefined);
});
it('searchAgents caps limit at 100', async () => {
diff --git a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/scheduleServer.test.ts b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/scheduleServer.test.ts
index 36486fe39..fac72baeb 100644
--- a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/scheduleServer.test.ts
+++ b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/scheduleServer.test.ts
@@ -87,7 +87,7 @@ describe('createScheduleServer.listSchedules', () => {
},
},
],
- response: { pagination: { limit: 10, nextPageToken: 'tok' } },
+ response: { pagination: { limit: 10, nextPageToken: 'tok', previousPageToken: 'prev-tok' } },
hasNextPage: () => true,
getNextPage: async () => undefined,
}));
@@ -109,6 +109,7 @@ describe('createScheduleServer.listSchedules', () => {
subjectDisplayName: '[email protected]',
});
expect(page.nextPageToken).toBe('tok');
+ expect(page.previousPageToken).toBe('prev-tok');
});
it('caps limit at 25', async () => {
diff --git a/packages/trueforge-ui/test/routing/ShellRouteSync.test.tsx b/packages/trueforge-ui/test/routing/ShellRouteSync.test.tsx
index c41e16ee2..6acb84100 100644
--- a/packages/trueforge-ui/test/routing/ShellRouteSync.test.tsx
+++ b/packages/trueforge-ui/test/routing/ShellRouteSync.test.tsx
@@ -88,7 +88,7 @@ function SettingsCatalogProvider({
updatedAt: '2026-01-01T00:00:00Z',
})),
// findAgentByName walks unfiltered pages and matches by exact name client-side.
- searchAgents: async () => [{ name: 'helper', agentId: 'helper-id' }],
+ searchAgents: async () => ({ data: [{ name: 'helper', agentId: 'helper-id' }] }),
});
return <ServerProvider server={server}>{children}</ServerProvider>;
}
diff --git a/packages/trueforge-ui/test/server/createTrueForgeServer.test.ts b/packages/trueforge-ui/test/server/createTrueForgeServer.test.ts
index 0d318af9d..02db999b8 100644
--- a/packages/trueforge-ui/test/server/createTrueForgeServer.test.ts
+++ b/packages/trueforge-ui/test/server/createTrueForgeServer.test.ts
@@ -39,7 +39,7 @@ describe('createTrueForgeServer', () => {
authenticated: true,
}));
const getMcpTools = vi.fn(async () => [{ id: 'search', name: 'search', description: 'Search repositories' }]);
- const searchAgents = vi.fn(async () => [{ name: 'ask-ai-agent', agentId: 'ask-ai-agent' }]);
+ const searchAgents = vi.fn(async () => ({ data: [{ name: 'ask-ai-agent', agentId: 'ask-ai-agent' }] }));
const saveAgent = vi.fn(async (): Promise<SaveAgentResult> => ({ agentId: 'agent-1' }));
const sessions = {
getAgent: vi.fn(),
@@ -78,9 +78,9 @@ describe('createTrueForgeServer', () => {
{ id: 'search', name: 'search', description: 'Search repositories' },
]);
expect(getMcpTools).toHaveBeenCalledWith({ connectorId: 'github' });
- await expect(server.searchAgents({ query: 'ask' })).resolves.toEqual([
- { name: 'ask-ai-agent', agentId: 'ask-ai-agent' },
- ]);
+ await expect(server.searchAgents({ query: 'ask' })).resolves.toEqual({
+ data: [{ name: 'ask-ai-agent', agentId: 'ask-ai-agent' }],
+ });
expect(searchAgents).toHaveBeenCalledWith({ query: 'ask' });
await server.saveAgent({
@@ -191,7 +191,7 @@ describe('createTrueForgeServer', () => {
getModels: async () => [],
getSkills: async () => [],
getMcp: async () => [],
- searchAgents: async () => [],
+ searchAgents: async () => ({ data: [] }),
saveAgent: async () => ({ agentId: 'agent-1' }),
catalog,
});
diff --git a/packages/trueforge-ui/test/server/mockServer.ts b/packages/trueforge-ui/test/server/mockServer.ts
index 1b23bc057..40afae97f 100644
--- a/packages/trueforge-ui/test/server/mockServer.ts
+++ b/packages/trueforge-ui/test/server/mockServer.ts
@@ -83,7 +83,7 @@ export function createMockAgentUIServer(overrides: Partial<AgentUIServer> = {}):
getModels: async () => [],
getSkills: async () => [],
getMcp: async () => [],
- searchAgents: async () => [],
+ searchAgents: async () => ({ data: [] }),
saveAgent: unavailable,
...overrides,
};