Skip to content

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

chore: Remove pagination from list MCP servers (#657)

Srajan Asthana74eae6cc5c47
diff --git a/.changeset/mcp-list-no-pagination.md b/.changeset/mcp-list-no-pagination.md
new file mode 100644
index 000000000..a9b8a5442
--- /dev/null
+++ b/.changeset/mcp-list-no-pagination.md
@@ -0,0 +1,7 @@
+---
+"@truefoundry/trueforge-sdk": minor
+"@truefoundry/trueforge-ui": minor
+"@truefoundry/trueforge": minor
+---
+
+Remove pagination from list MCP servers across the API, SDK, and UI; return and search the complete configured MCP catalog client-side.
diff --git a/.github/fern/openapi/openapi.json b/.github/fern/openapi/openapi.json
index 924dbb06c..e66a00e41 100644
--- a/.github/fern/openapi/openapi.json
+++ b/.github/fern/openapi/openapi.json
@@ -1689,14 +1689,10 @@
"$ref": "#/components/schemas/AvailableMCPServer"
},
"type": "array"
- },
- "pagination": {
- "$ref": "#/components/schemas/TokenPagination"
}
},
"required": [
- "data",
- "pagination"
+ "data"
],
"type": "object"
},
@@ -1751,14 +1747,10 @@
"$ref": "#/components/schemas/ConfiguredMCPServer"
},
"type": "array"
- },
- "pagination": {
- "$ref": "#/components/schemas/TokenPagination"
}
},
"required": [
- "data",
- "pagination"
+ "data"
],
"type": "object"
},
@@ -5930,32 +5922,7 @@
},
"/api/v1/mcp-servers": {
"get": {
- "description": "Paginated MCP servers as a slim name/url list for the composer.",
- "parameters": [
- {
- "description": "Page size. Defaults to 100, max 200.",
- "in": "query",
- "name": "limit",
- "required": false,
- "schema": {
- "default": 100,
- "description": "Page size. Defaults to 100, max 200.",
- "maximum": 200,
- "minimum": 1,
- "type": "integer"
- }
- },
- {
- "description": "Opaque token from a previous response `next_page_token`.",
- "in": "query",
- "name": "page_token",
- "required": false,
- "schema": {
- "description": "Opaque token from a previous response `next_page_token`.",
- "type": "string"
- }
- }
- ],
+ "description": "Configured MCP servers as a slim name/url list for the composer.",
"responses": {
"200": {
"content": {
@@ -5965,17 +5932,7 @@
}
}
},
- "description": "Paginated MCP servers (chat projection)."
- },
- "400": {
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/RequestErrorResponse"
- }
- }
- },
- "description": "Invalid query parameters or page token."
+ "description": "All configured MCP servers (chat projection)."
},
"401": {
"content": {
@@ -5992,11 +5949,6 @@
"tags": [
"MCP Servers"
],
- "x-fern-pagination": {
- "cursor": "$request.page_token",
- "next_cursor": "$response.pagination.next_page_token",
- "results": "$response.data"
- },
"x-fern-sdk-group-name": [
"mcpServers"
],
@@ -8206,32 +8158,7 @@
},
"/api/v1/settings/mcp-servers": {
"get": {
- "description": "Paginated MCP servers with auth_status. Header secrets are redacted.",
- "parameters": [
- {
- "description": "Page size. Defaults to 100, max 200.",
- "in": "query",
- "name": "limit",
- "required": false,
- "schema": {
- "default": 100,
- "description": "Page size. Defaults to 100, max 200.",
- "maximum": 200,
- "minimum": 1,
- "type": "integer"
- }
- },
- {
- "description": "Opaque token from a previous response `next_page_token`.",
- "in": "query",
- "name": "page_token",
- "required": false,
- "schema": {
- "description": "Opaque token from a previous response `next_page_token`.",
- "type": "string"
- }
- }
- ],
+ "description": "Configured MCP servers with auth_status. Header secrets are redacted.",
"responses": {
"200": {
"content": {
@@ -8241,17 +8168,7 @@
}
}
},
- "description": "Paginated MCP servers"
- },
- "400": {
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/RequestErrorResponse"
- }
- }
- },
- "description": "Invalid query parameters or page token."
+ "description": "All configured MCP servers"
},
"401": {
"content": {
@@ -8278,11 +8195,6 @@
"tags": [
"MCP Servers"
],
- "x-fern-pagination": {
- "cursor": "$request.page_token",
- "next_cursor": "$response.pagination.next_page_token",
- "results": "$response.data"
- },
"x-fern-sdk-group-name": [
"settings",
"mcpServers"
diff --git a/docs/openapi.json b/docs/openapi.json
index 924dbb06c..e66a00e41 100644
--- a/docs/openapi.json
+++ b/docs/openapi.json
@@ -1689,14 +1689,10 @@
"$ref": "#/components/schemas/AvailableMCPServer"
},
"type": "array"
- },
- "pagination": {
- "$ref": "#/components/schemas/TokenPagination"
}
},
"required": [
- "data",
- "pagination"
+ "data"
],
"type": "object"
},
@@ -1751,14 +1747,10 @@
"$ref": "#/components/schemas/ConfiguredMCPServer"
},
"type": "array"
- },
- "pagination": {
- "$ref": "#/components/schemas/TokenPagination"
}
},
"required": [
- "data",
- "pagination"
+ "data"
],
"type": "object"
},
@@ -5930,32 +5922,7 @@
},
"/api/v1/mcp-servers": {
"get": {
- "description": "Paginated MCP servers as a slim name/url list for the composer.",
- "parameters": [
- {
- "description": "Page size. Defaults to 100, max 200.",
- "in": "query",
- "name": "limit",
- "required": false,
- "schema": {
- "default": 100,
- "description": "Page size. Defaults to 100, max 200.",
- "maximum": 200,
- "minimum": 1,
- "type": "integer"
- }
- },
- {
- "description": "Opaque token from a previous response `next_page_token`.",
- "in": "query",
- "name": "page_token",
- "required": false,
- "schema": {
- "description": "Opaque token from a previous response `next_page_token`.",
- "type": "string"
- }
- }
- ],
+ "description": "Configured MCP servers as a slim name/url list for the composer.",
"responses": {
"200": {
"content": {
@@ -5965,17 +5932,7 @@
}
}
},
- "description": "Paginated MCP servers (chat projection)."
- },
- "400": {
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/RequestErrorResponse"
- }
- }
- },
- "description": "Invalid query parameters or page token."
+ "description": "All configured MCP servers (chat projection)."
},
"401": {
"content": {
@@ -5992,11 +5949,6 @@
"tags": [
"MCP Servers"
],
- "x-fern-pagination": {
- "cursor": "$request.page_token",
- "next_cursor": "$response.pagination.next_page_token",
- "results": "$response.data"
- },
"x-fern-sdk-group-name": [
"mcpServers"
],
@@ -8206,32 +8158,7 @@
},
"/api/v1/settings/mcp-servers": {
"get": {
- "description": "Paginated MCP servers with auth_status. Header secrets are redacted.",
- "parameters": [
- {
- "description": "Page size. Defaults to 100, max 200.",
- "in": "query",
- "name": "limit",
- "required": false,
- "schema": {
- "default": 100,
- "description": "Page size. Defaults to 100, max 200.",
- "maximum": 200,
- "minimum": 1,
- "type": "integer"
- }
- },
- {
- "description": "Opaque token from a previous response `next_page_token`.",
- "in": "query",
- "name": "page_token",
- "required": false,
- "schema": {
- "description": "Opaque token from a previous response `next_page_token`.",
- "type": "string"
- }
- }
- ],
+ "description": "Configured MCP servers with auth_status. Header secrets are redacted.",
"responses": {
"200": {
"content": {
@@ -8241,17 +8168,7 @@
}
}
},
- "description": "Paginated MCP servers"
- },
- "400": {
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/RequestErrorResponse"
- }
- }
- },
- "description": "Invalid query parameters or page token."
+ "description": "All configured MCP servers"
},
"401": {
"content": {
@@ -8278,11 +8195,6 @@
"tags": [
"MCP Servers"
],
- "x-fern-pagination": {
- "cursor": "$request.page_token",
- "next_cursor": "$response.pagination.next_page_token",
- "results": "$response.data"
- },
"x-fern-sdk-group-name": [
"settings",
"mcpServers"
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index ac033d6ca..b6fee13a4 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -26,7 +26,7 @@
"@assistant-ui/core": "0.2.22",
"@assistant-ui/react": "0.14.27",
"@assistant-ui/store": "0.2.21",
- "@truefoundry/assistant-ui-runtime": "0.1.31",
+ "@truefoundry/assistant-ui-runtime": "0.1.33",
"@truefoundry/trueforge-sdk": "workspace:*",
"@truefoundry/trueforge-ui": "workspace:*",
"monaco-editor": "^0.52.0",
diff --git a/packages/trueforge-sdk/reference.md b/packages/trueforge-sdk/reference.md
index a0daae46c..f188cbeb4 100644
--- a/packages/trueforge-sdk/reference.md
+++ b/packages/trueforge-sdk/reference.md
@@ -441,7 +441,7 @@ await client.server.getCapabilities();
</details>
## MCP Servers
-<details><summary><code>client.mcpServers.<a href="/src/api/resources/mcpServers/client/Client.ts">list</a>({ ...params }) -> core.Page&lt;TrueForge.AvailableMcpServer, TrueForge.ListAvailableMcpServersResponse&gt;</code></summary>
+<details><summary><code>client.mcpServers.<a href="/src/api/resources/mcpServers/client/Client.ts">list</a>() -> TrueForge.ListAvailableMcpServersResponse</code></summary>
<dl>
<dd>
@@ -453,7 +453,7 @@ await client.server.getCapabilities();
<dl>
<dd>
-Paginated MCP servers as a slim name/url list for the composer.
+Configured MCP servers as a slim name/url list for the composer.
</dd>
</dl>
</dd>
@@ -484,14 +484,6 @@ await client.mcpServers.list();
<dl>
<dd>
-**request:** `TrueForge.ListMcpServersRequest`
-
-</dd>
-</dl>
-
-<dl>
-<dd>
-
**requestOptions:** `McpServersClient.RequestOptions`
</dd>
@@ -2905,7 +2897,7 @@ await client.internal.agents.getCodeSnippets("agent_id");
</details>
## Settings McpServers
-<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">list</a>({ ...params }) -> core.Page&lt;TrueForge.ConfiguredMcpServer, TrueForge.ListMcpServersResponse&gt;</code></summary>
+<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">list</a>() -> TrueForge.ListMcpServersResponse</code></summary>
<dl>
<dd>
@@ -2917,7 +2909,7 @@ await client.internal.agents.getCodeSnippets("agent_id");
<dl>
<dd>
-Paginated MCP servers with auth_status. Header secrets are redacted.
+Configured MCP servers with auth_status. Header secrets are redacted.
</dd>
</dl>
</dd>
@@ -2948,14 +2940,6 @@ await client.settings.mcpServers.list();
<dl>
<dd>
-**request:** `TrueForge.settings.ListMcpServersRequest`
-
-</dd>
-</dl>
-
-<dl>
-<dd>
-
**requestOptions:** `McpServersClient.RequestOptions`
</dd>
diff --git a/packages/trueforge-sdk/src/api/resources/mcpServers/client/Client.ts b/packages/trueforge-sdk/src/api/resources/mcpServers/client/Client.ts
index 38dd38cac..c4c879f00 100644
--- a/packages/trueforge-sdk/src/api/resources/mcpServers/client/Client.ts
+++ b/packages/trueforge-sdk/src/api/resources/mcpServers/client/Client.ts
@@ -23,12 +23,10 @@ export class McpServersClient {
}
/**
- * Paginated MCP servers as a slim name/url list for the composer.
+ * Configured MCP servers as a slim name/url list for the composer.
*
- * @param {TrueForge.ListMcpServersRequest} request
* @param {McpServersClient.RequestOptions} requestOptions - Request-specific configuration.
*
- * @throws {@link TrueForge.BadRequestError}
* @throws {@link TrueForge.UnauthorizedError}
* @throws {@link errors.TrueForgeError}
* @throws {@link errors.TrueForgeTimeoutError}
@@ -36,103 +34,72 @@ export class McpServersClient {
* @example
* await client.mcpServers.list()
*/
- public async list(
- request: TrueForge.ListMcpServersRequest = {},
+ public list(
+ requestOptions?: McpServersClient.RequestOptions,
+ ): core.HttpResponsePromise<TrueForge.ListAvailableMcpServersResponse> {
+ return core.HttpResponsePromise.fromPromise(this.__list(requestOptions));
+ }
+
+ private async __list(
requestOptions?: McpServersClient.RequestOptions,
- ): Promise<core.Page<TrueForge.AvailableMcpServer, TrueForge.ListAvailableMcpServersResponse>> {
- const list = core.HttpResponsePromise.interceptFunction(
- async (
- request: TrueForge.ListMcpServersRequest,
- ): Promise<core.WithRawResponse<TrueForge.ListAvailableMcpServersResponse>> => {
- const { limit = 100, pageToken } = request;
- const _queryParams: Record<string, unknown> = {
- limit,
- page_token: pageToken,
- };
- const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
- const _headers: core.Fetcher.Args["headers"] = mergeHeaders(
- _authRequest.headers,
- this._options?.headers,
- requestOptions?.headers,
- );
- const _response = await (this._options.fetcher ?? core.fetcher)({
- url: core.url.join(
- (await core.Supplier.get(this._options.baseUrl)) ??
- (await core.Supplier.get(this._options.environment)),
- "api/v1/mcp-servers",
- ),
- method: "GET",
- headers: _headers,
- queryString: core.url
- .queryBuilder()
- .addMany(_queryParams)
- .mergeAdditional(requestOptions?.queryParams)
- .build(),
- timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
- maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
- abortSignal: requestOptions?.abortSignal,
- fetchFn: this._options?.fetch,
- logging: this._options.logging,
- });
- if (_response.ok) {
- return {
- data: serializers.ListAvailableMcpServersResponse.parseOrThrow(_response.body, {
+ ): Promise<core.WithRawResponse<TrueForge.ListAvailableMcpServersResponse>> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
+ this._options?.headers,
+ requestOptions?.headers,
+ );
+ const _response = await (this._options.fetcher ?? core.fetcher)({
+ url: core.url.join(
+ (await core.Supplier.get(this._options.baseUrl)) ??
+ (await core.Supplier.get(this._options.environment)),
+ "api/v1/mcp-servers",
+ ),
+ method: "GET",
+ headers: _headers,
+ queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),
+ timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
+ maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
+ abortSignal: requestOptions?.abortSignal,
+ fetchFn: this._options?.fetch,
+ logging: this._options.logging,
+ });
+ if (_response.ok) {
+ return {
+ data: serializers.ListAvailableMcpServersResponse.parseOrThrow(_response.body, {
+ unrecognizedObjectKeys: "passthrough",
+ allowUnrecognizedUnionMembers: true,
+ allowUnrecognizedEnumValues: true,
+ skipValidation: true,
+ breadcrumbsPrefix: ["response"],
+ }),
+ rawResponse: _response.rawResponse,
+ };
+ }
+
+ if (_response.error.reason === "status-code") {
+ switch (_response.error.statusCode) {
+ case 401:
+ throw new TrueForge.UnauthorizedError(
+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {
unrecognizedObjectKeys: "passthrough",
allowUnrecognizedUnionMembers: true,
allowUnrecognizedEnumValues: true,
skipValidation: true,
breadcrumbsPrefix: ["response"],
}),
+ _response.rawResponse,
+ );
+ default:
+ throw new errors.TrueForgeError({
+ statusCode: _response.error.statusCode,
+ body: _response.error.body,
rawResponse: _response.rawResponse,
- };
- }
- if (_response.error.reason === "status-code") {
- switch (_response.error.statusCode) {
- case 400:
- throw new TrueForge.BadRequestError(
- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {
- unrecognizedObjectKeys: "passthrough",
- allowUnrecognizedUnionMembers: true,
- allowUnrecognizedEnumValues: true,
- skipValidation: true,
- breadcrumbsPrefix: ["response"],
- }),
- _response.rawResponse,
- );
- case 401:
- throw new TrueForge.UnauthorizedError(
- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {
- unrecognizedObjectKeys: "passthrough",
- allowUnrecognizedUnionMembers: true,
- allowUnrecognizedEnumValues: true,
- skipValidation: true,
- breadcrumbsPrefix: ["response"],
- }),
- _response.rawResponse,
- );
- default:
- throw new errors.TrueForgeError({
- statusCode: _response.error.statusCode,
- body: _response.error.body,
- rawResponse: _response.rawResponse,
- });
- }
- }
- return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/api/v1/mcp-servers");
- },
- );
- const dataWithRawResponse = await list(request).withRawResponse();
- return new core.Page<TrueForge.AvailableMcpServer, TrueForge.ListAvailableMcpServersResponse>({
- response: dataWithRawResponse.data,
- rawResponse: dataWithRawResponse.rawResponse,
- hasNextPage: (response) =>
- response?.pagination.nextPageToken != null &&
- !(typeof response?.pagination.nextPageToken === "string" && response?.pagination.nextPageToken === ""),
- getItems: (response) => response?.data ?? [],
- loadPage: (response) => {
- return list(core.setObjectProperty(request, "pageToken", response?.pagination.nextPageToken));
- },
- });
+ });
+ }
+ }
+
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/api/v1/mcp-servers");
}
/**
diff --git a/packages/trueforge-sdk/src/api/resources/mcpServers/client/requests/ListMcpServersRequest.ts b/packages/trueforge-sdk/src/api/resources/mcpServers/client/requests/ListMcpServersRequest.ts
deleted file mode 100644
index 1ae7afca8..000000000
--- a/packages/trueforge-sdk/src/api/resources/mcpServers/client/requests/ListMcpServersRequest.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file was auto-generated by Fern from our API Definition.
-
-/**
- * @example
- * {}
- */
-export interface ListMcpServersRequest {
- /** Page size. Defaults to 100, max 200. */
- limit?: number;
- /** Opaque token from a previous response `next_page_token`. */
- pageToken?: string;
-}
diff --git a/packages/trueforge-sdk/src/api/resources/mcpServers/client/requests/index.ts b/packages/trueforge-sdk/src/api/resources/mcpServers/client/requests/index.ts
index 3716ca15b..9f3c48ef4 100644
--- a/packages/trueforge-sdk/src/api/resources/mcpServers/client/requests/index.ts
+++ b/packages/trueforge-sdk/src/api/resources/mcpServers/client/requests/index.ts
@@ -1,2 +1 @@
export type { AuthorizeMcpServersRequest } from "./AuthorizeMcpServersRequest.js";
-export type { ListMcpServersRequest } from "./ListMcpServersRequest.js";
diff --git a/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/Client.ts b/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/Client.ts
index 4c38f5d30..c1e8ea7be 100644
--- a/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/Client.ts
+++ b/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/Client.ts
@@ -24,12 +24,10 @@ export class McpServersClient {
}
/**
- * Paginated MCP servers with auth_status. Header secrets are redacted.
+ * Configured MCP servers with auth_status. Header secrets are redacted.
*
- * @param {TrueForge.settings.ListMcpServersRequest} request
* @param {McpServersClient.RequestOptions} requestOptions - Request-specific configuration.
*
- * @throws {@link TrueForge.BadRequestError}
* @throws {@link TrueForge.UnauthorizedError}
* @throws {@link TrueForge.ForbiddenError}
* @throws {@link errors.TrueForgeError}
@@ -38,119 +36,83 @@ export class McpServersClient {
* @example
* await client.settings.mcpServers.list()
*/
- public async list(
- request: TrueForge.settings.ListMcpServersRequest = {},
+ public list(
+ requestOptions?: McpServersClient.RequestOptions,
+ ): core.HttpResponsePromise<TrueForge.ListMcpServersResponse> {
+ return core.HttpResponsePromise.fromPromise(this.__list(requestOptions));
+ }
+
+ private async __list(
requestOptions?: McpServersClient.RequestOptions,
- ): Promise<core.Page<TrueForge.ConfiguredMcpServer, TrueForge.ListMcpServersResponse>> {
- const list = core.HttpResponsePromise.interceptFunction(
- async (
- request: TrueForge.settings.ListMcpServersRequest,
- ): Promise<core.WithRawResponse<TrueForge.ListMcpServersResponse>> => {
- const { limit = 100, pageToken } = request;
- const _queryParams: Record<string, unknown> = {
- limit,
- page_token: pageToken,
- };
- const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
- const _headers: core.Fetcher.Args["headers"] = mergeHeaders(
- _authRequest.headers,
- this._options?.headers,
- requestOptions?.headers,
- );
- const _response = await (this._options.fetcher ?? core.fetcher)({
- url: core.url.join(
- (await core.Supplier.get(this._options.baseUrl)) ??
- (await core.Supplier.get(this._options.environment)),
- "api/v1/settings/mcp-servers",
- ),
- method: "GET",
- headers: _headers,
- queryString: core.url
- .queryBuilder()
- .addMany(_queryParams)
- .mergeAdditional(requestOptions?.queryParams)
- .build(),
- timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
- maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
- abortSignal: requestOptions?.abortSignal,
- fetchFn: this._options?.fetch,
- logging: this._options.logging,
- });
- if (_response.ok) {
- return {
- data: serializers.ListMcpServersResponse.parseOrThrow(_response.body, {
+ ): Promise<core.WithRawResponse<TrueForge.ListMcpServersResponse>> {
+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();
+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(
+ _authRequest.headers,
+ this._options?.headers,
+ requestOptions?.headers,
+ );
+ const _response = await (this._options.fetcher ?? core.fetcher)({
+ url: core.url.join(
+ (await core.Supplier.get(this._options.baseUrl)) ??
+ (await core.Supplier.get(this._options.environment)),
+ "api/v1/settings/mcp-servers",
+ ),
+ method: "GET",
+ headers: _headers,
+ queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),
+ timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
+ maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
+ abortSignal: requestOptions?.abortSignal,
+ fetchFn: this._options?.fetch,
+ logging: this._options.logging,
+ });
+ if (_response.ok) {
+ return {
+ data: serializers.ListMcpServersResponse.parseOrThrow(_response.body, {
+ unrecognizedObjectKeys: "passthrough",
+ allowUnrecognizedUnionMembers: true,
+ allowUnrecognizedEnumValues: true,
+ skipValidation: true,
+ breadcrumbsPrefix: ["response"],
+ }),
+ rawResponse: _response.rawResponse,
+ };
+ }
+
+ if (_response.error.reason === "status-code") {
+ switch (_response.error.statusCode) {
+ case 401:
+ throw new TrueForge.UnauthorizedError(
+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {
+ unrecognizedObjectKeys: "passthrough",
+ allowUnrecognizedUnionMembers: true,
+ allowUnrecognizedEnumValues: true,
+ skipValidation: true,
+ breadcrumbsPrefix: ["response"],
+ }),
+ _response.rawResponse,
+ );
+ case 403:
+ throw new TrueForge.ForbiddenError(
+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {
unrecognizedObjectKeys: "passthrough",
allowUnrecognizedUnionMembers: true,
allowUnrecognizedEnumValues: true,
skipValidation: true,
breadcrumbsPrefix: ["response"],
}),
+ _response.rawResponse,
+ );
+ default:
+ throw new errors.TrueForgeError({
+ statusCode: _response.error.statusCode,
+ body: _response.error.body,
rawResponse: _response.rawResponse,
- };
- }
- if (_response.error.reason === "status-code") {
- switch (_response.error.statusCode) {
- case 400:
- throw new TrueForge.BadRequestError(
- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {
- unrecognizedObjectKeys: "passthrough",
- allowUnrecognizedUnionMembers: true,
- allowUnrecognizedEnumValues: true,
- skipValidation: true,
- breadcrumbsPrefix: ["response"],
- }),
- _response.rawResponse,
- );
- case 401:
- throw new TrueForge.UnauthorizedError(
- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {
- unrecognizedObjectKeys: "passthrough",
- allowUnrecognizedUnionMembers: true,
- allowUnrecognizedEnumValues: true,
- skipValidation: true,
- breadcrumbsPrefix: ["response"],
- }),
- _response.rawResponse,
- );
- case 403:
- throw new TrueForge.ForbiddenError(
- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {
- unrecognizedObjectKeys: "passthrough",
- allowUnrecognizedUnionMembers: true,
- allowUnrecognizedEnumValues: true,
- skipValidation: true,
- breadcrumbsPrefix: ["response"],
- }),
- _response.rawResponse,
- );
- default:
- throw new errors.TrueForgeError({
- statusCode: _response.error.statusCode,
- body: _response.error.body,
- rawResponse: _response.rawResponse,
- });
- }
- }
- return handleNonStatusCodeError(
- _response.error,
- _response.rawResponse,
- "GET",
- "/api/v1/settings/mcp-servers",
- );
- },
- );
- const dataWithRawResponse = await list(request).withRawResponse();
- return new core.Page<TrueForge.ConfiguredMcpServer, TrueForge.ListMcpServersResponse>({
- response: dataWithRawResponse.data,
- rawResponse: dataWithRawResponse.rawResponse,
- hasNextPage: (response) =>
- response?.pagination.nextPageToken != null &&
- !(typeof response?.pagination.nextPageToken === "string" && response?.pagination.nextPageToken === ""),
- getItems: (response) => response?.data ?? [],
- loadPage: (response) => {
- return list(core.setObjectProperty(request, "pageToken", response?.pagination.nextPageToken));
- },
- });
+ });
+ }
+ }
+
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/api/v1/settings/mcp-servers");
}
/**
diff --git a/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/requests/ListMcpServersRequest.ts b/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/requests/ListMcpServersRequest.ts
deleted file mode 100644
index 1ae7afca8..000000000
--- a/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/requests/ListMcpServersRequest.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file was auto-generated by Fern from our API Definition.
-
-/**
- * @example
- * {}
- */
-export interface ListMcpServersRequest {
- /** Page size. Defaults to 100, max 200. */
- limit?: number;
- /** Opaque token from a previous response `next_page_token`. */
- pageToken?: string;
-}
diff --git a/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/requests/index.ts b/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/requests/index.ts
index f613d1329..fc296fdb3 100644
--- a/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/requests/index.ts
+++ b/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/requests/index.ts
@@ -1,3 +1,2 @@
export type { CreateMcpServerRequest } from "./CreateMcpServerRequest.js";
-export type { ListMcpServersRequest } from "./ListMcpServersRequest.js";
export type { UpdateMcpServerRequest } from "./UpdateMcpServerRequest.js";
diff --git a/packages/trueforge-sdk/src/api/types/ListAvailableMcpServersResponse.ts b/packages/trueforge-sdk/src/api/types/ListAvailableMcpServersResponse.ts
index d2d9c7525..6801fb973 100644
--- a/packages/trueforge-sdk/src/api/types/ListAvailableMcpServersResponse.ts
+++ b/packages/trueforge-sdk/src/api/types/ListAvailableMcpServersResponse.ts
@@ -4,5 +4,4 @@ import type * as TrueForge from "../index.js";
export interface ListAvailableMcpServersResponse {
data: TrueForge.AvailableMcpServer[];
- pagination: TrueForge.TokenPagination;
}
diff --git a/packages/trueforge-sdk/src/api/types/ListMcpServersResponse.ts b/packages/trueforge-sdk/src/api/types/ListMcpServersResponse.ts
index a97f0018c..e0165c61d 100644
--- a/packages/trueforge-sdk/src/api/types/ListMcpServersResponse.ts
+++ b/packages/trueforge-sdk/src/api/types/ListMcpServersResponse.ts
@@ -4,5 +4,4 @@ import type * as TrueForge from "../index.js";
export interface ListMcpServersResponse {
data: TrueForge.ConfiguredMcpServer[];
- pagination: TrueForge.TokenPagination;
}
diff --git a/packages/trueforge-sdk/src/serialization/types/ListAvailableMcpServersResponse.ts b/packages/trueforge-sdk/src/serialization/types/ListAvailableMcpServersResponse.ts
index 47abdf4d4..84dbffc66 100644
--- a/packages/trueforge-sdk/src/serialization/types/ListAvailableMcpServersResponse.ts
+++ b/packages/trueforge-sdk/src/serialization/types/ListAvailableMcpServersResponse.ts
@@ -4,19 +4,16 @@ import type * as TrueForge from "../../api/index.js";
import * as core from "../../core/index.js";
import type * as serializers from "../index.js";
import { AvailableMcpServer } from "./AvailableMcpServer.js";
-import { TokenPagination } from "./TokenPagination.js";
export const ListAvailableMcpServersResponse: core.serialization.ObjectSchema<
serializers.ListAvailableMcpServersResponse.Raw,
TrueForge.ListAvailableMcpServersResponse
> = core.serialization.object({
data: core.serialization.list(AvailableMcpServer),
- pagination: TokenPagination,
});
export declare namespace ListAvailableMcpServersResponse {
export interface Raw {
data: AvailableMcpServer.Raw[];
- pagination: TokenPagination.Raw;
}
}
diff --git a/packages/trueforge-sdk/src/serialization/types/ListMcpServersResponse.ts b/packages/trueforge-sdk/src/serialization/types/ListMcpServersResponse.ts
index edff253b4..cb4af53ea 100644
--- a/packages/trueforge-sdk/src/serialization/types/ListMcpServersResponse.ts
+++ b/packages/trueforge-sdk/src/serialization/types/ListMcpServersResponse.ts
@@ -4,19 +4,16 @@ import type * as TrueForge from "../../api/index.js";
import * as core from "../../core/index.js";
import type * as serializers from "../index.js";
import { ConfiguredMcpServer } from "./ConfiguredMcpServer.js";
-import { TokenPagination } from "./TokenPagination.js";
export const ListMcpServersResponse: core.serialization.ObjectSchema<
serializers.ListMcpServersResponse.Raw,
TrueForge.ListMcpServersResponse
> = core.serialization.object({
data: core.serialization.list(ConfiguredMcpServer),
- pagination: TokenPagination,
});
export declare namespace ListMcpServersResponse {
export interface Raw {
data: ConfiguredMcpServer.Raw[];
- pagination: TokenPagination.Raw;
}
}
diff --git a/packages/trueforge-sdk/tests/wire/mcpServers.test.ts b/packages/trueforge-sdk/tests/wire/mcpServers.test.ts
index 8fc4e7b99..ec166ff3b 100644
--- a/packages/trueforge-sdk/tests/wire/mcpServers.test.ts
+++ b/packages/trueforge-sdk/tests/wire/mcpServers.test.ts
@@ -11,18 +11,18 @@ describe("McpServersClient", () => {
const rawResponseBody = {
data: [{ auth: { type: "dcr" }, auth_status: { status: "authenticated" }, name: "name", url: "url" }],
- pagination: { limit: 1, next_page_token: "next_page_token", previous_page_token: "previous_page_token" },
};
server
- .mockEndpoint({ once: false })
+ .mockEndpoint()
.get("/api/v1/mcp-servers")
.respondWith()
.statusCode(200)
.jsonBody(rawResponseBody)
.build();
- const expected = {
+ const response = await client.mcpServers.list();
+ expect(response).toEqual({
data: [
{
auth: {
@@ -35,18 +35,7 @@ describe("McpServersClient", () => {
url: "url",
},
],
- pagination: {
- limit: 1,
- nextPageToken: "next_page_token",
- previousPageToken: "previous_page_token",
- },
- };
- const page = await client.mcpServers.list();
-
- expect(expected.data).toEqual(page.data);
- expect(page.hasNextPage()).toBe(true);
- const nextPage = await page.getNextPage();
- expect(expected.data).toEqual(nextPage.data);
+ });
});
test("list (2)", async () => {
@@ -55,25 +44,6 @@ describe("McpServersClient", () => {
const rawResponseBody = { error: { message: "message" } };
- server
- .mockEndpoint()
- .get("/api/v1/mcp-servers")
- .respondWith()
- .statusCode(400)
- .jsonBody(rawResponseBody)
- .build();
-
- await expect(async () => {
- return await client.mcpServers.list();
- }).rejects.toThrow(TrueForgeTypes.BadRequestError);
- });
-
- test("list (3)", async () => {
- const server = mockServerPool.createServer();
- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });
-
- const rawResponseBody = { error: { message: "message" } };
-
server
.mockEndpoint()
.get("/api/v1/mcp-servers")
diff --git a/packages/trueforge-sdk/tests/wire/settings/mcpServers.test.ts b/packages/trueforge-sdk/tests/wire/settings/mcpServers.test.ts
index 0a673c9b5..9e92895a3 100644
--- a/packages/trueforge-sdk/tests/wire/settings/mcpServers.test.ts
+++ b/packages/trueforge-sdk/tests/wire/settings/mcpServers.test.ts
@@ -17,18 +17,18 @@ describe("McpServersClient", () => {
name: "name",
},
],
- pagination: { limit: 1, next_page_token: "next_page_token", previous_page_token: "previous_page_token" },
};
server
- .mockEndpoint({ once: false })
+ .mockEndpoint()
.get("/api/v1/settings/mcp-servers")
.respondWith()
.statusCode(200)
.jsonBody(rawResponseBody)
.build();
- const expected = {
+ const response = await client.settings.mcpServers.list();
+ expect(response).toEqual({
data: [
{
authStatus: {
@@ -43,18 +43,7 @@ describe("McpServersClient", () => {
name: "name",
},
],
- pagination: {
- limit: 1,
- nextPageToken: "next_page_token",
- previousPageToken: "previous_page_token",
- },
- };
- const page = await client.settings.mcpServers.list();
-
- expect(expected.data).toEqual(page.data);
- expect(page.hasNextPage()).toBe(true);
- const nextPage = await page.getNextPage();
- expect(expected.data).toEqual(nextPage.data);
+ });
});
test("list (2)", async () => {
@@ -63,25 +52,6 @@ describe("McpServersClient", () => {
const rawResponseBody = { error: { message: "message" } };
- server
- .mockEndpoint()
- .get("/api/v1/settings/mcp-servers")
- .respondWith()
- .statusCode(400)
- .jsonBody(rawResponseBody)
- .build();
-
- await expect(async () => {
- return await client.settings.mcpServers.list();
- }).rejects.toThrow(TrueForgeTypes.BadRequestError);
- });
-
- test("list (3)", async () => {
- const server = mockServerPool.createServer();
- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });
-
- const rawResponseBody = { error: { message: "message" } };
-
server
.mockEndpoint()
.get("/api/v1/settings/mcp-servers")
@@ -95,7 +65,7 @@ describe("McpServersClient", () => {
}).rejects.toThrow(TrueForgeTypes.UnauthorizedError);
});
- test("list (4)", async () => {
+ test("list (3)", async () => {
const server = mockServerPool.createServer();
const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });
diff --git a/packages/trueforge-ui/package.json b/packages/trueforge-ui/package.json
index 9f08a8af8..9d5f7ffa1 100644
--- a/packages/trueforge-ui/package.json
+++ b/packages/trueforge-ui/package.json
@@ -95,7 +95,7 @@
"@openuidev/react-headless": "^0.9.4",
"@openuidev/react-lang": "^0.2.9",
"@openuidev/react-ui": "^0.13.2",
- "@truefoundry/assistant-ui-runtime": "0.1.31",
+ "@truefoundry/assistant-ui-runtime": "0.1.33",
"@truefoundry/trueforge-sdk": "workspace:*",
"chart.js": "^4.5.1",
"clsx": "^2.1.1",
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx b/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx
index 5e54b4aea..94d0de6d4 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx
@@ -8,14 +8,12 @@ import type { AgentSpec, ConnectorState, McpToolSelection } from '../../server/t
import { auiButtonClass } from '../lib/buttonClasses.js';
import { cn } from '../lib/cn.js';
import { auiInputClass } from '../lib/inputClasses.js';
-import { useInfiniteScrollSentinel } from '../lib/useInfiniteScrollSentinel.js';
import { Button } from '../primitives/Button.js';
import { CatalogLogo } from '../primitives/CatalogLogo.js';
import { Spinner } from '../primitives/Spinner.js';
import { Switch } from '../primitives/Switch.js';
import { Tooltip } from '../primitives/Tooltip.js';
import { editableMountsFromSpec, enabledToolsFromMount, withEnabledTools } from './agentConfigMounts.js';
-import { useDraftCatalog } from './DraftCatalogProvider.js';
import { connectorsWithSelectedStubs } from './mcpConnectorStubs.js';
export type AgentMcpEditorContentProps = {
@@ -100,8 +98,6 @@ export function AgentMcpEditorContent({
onRefreshConnectors,
onChange,
}: AgentMcpEditorContentProps) {
- const { connectorsHasMore, connectorsLoadMoreFailed, connectorsLoadingMore, loading, loadMoreConnectors } =
- useDraftCatalog();
const [toolQuery, setToolQuery] = useState('');
const [collapsedMountIds, setCollapsedMountIds] = useState<ReadonlySet<string>>(() => new Set());
const mcpMounts = editableMountsFromSpec(spec.mcpServers);
@@ -121,12 +117,6 @@ export function AgentMcpEditorContent({
const filteredTools =
normalizedToolQuery === '' ? tools : tools.filter(tool => tool.name.toLowerCase().includes(normalizedToolQuery));
- const { listRef: connectorsListRef, sentinelRef: connectorsSentinelRef } = useInfiniteScrollSentinel({
- enabled: true,
- hasMore: connectorsHasMore && !connectorsLoadMoreFailed,
- loading: connectorsLoadingMore || loading,
- onLoadMore: loadMoreConnectors,
- });
const updateMount = (mountId: string, value: object) => {
onChange({
...spec,
@@ -192,7 +182,7 @@ export function AgentMcpEditorContent({
className={auiInputClass('h-8 w-full pl-7')}
/>
</label>
- <div ref={connectorsListRef} className="min-h-0 flex-1 overflow-y-auto p-2">
+ <div className="min-h-0 flex-1 overflow-y-auto p-2">
{filteredConnectors.map(connector => {
const mounted = mcpMounts.some(item => item.id === connector.id || item.name === connector.name);
const active = connector.id === activeConnectorId;
@@ -221,24 +211,6 @@ export function AgentMcpEditorContent({
</button>
);
})}
- {connectorsHasMore ? (
- <div
- ref={connectorsLoadMoreFailed ? undefined : connectorsSentinelRef}
- className="flex h-8 items-center justify-center"
- >
- {connectorsLoadMoreFailed ? (
- <button
- type="button"
- className={auiButtonClass({ variant: 'ghost', size: 'small' })}
- onClick={loadMoreConnectors}
- >
- Retry loading connectors
- </button>
- ) : connectorsLoadingMore ? (
- <Spinner size={16} className="text-text-secondary" aria-label="Loading more MCP servers" />
- ) : null}
- </div>
- ) : null}
</div>
</div>
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftCatalogProvider.tsx b/packages/trueforge-ui/src/atoms/draft/DraftCatalogProvider.tsx
index 894a8dfa7..81e838d76 100644
--- a/packages/trueforge-ui/src/atoms/draft/DraftCatalogProvider.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/DraftCatalogProvider.tsx
@@ -1,6 +1,6 @@
'use client';
-import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, type ReactNode } from 'react';
+import { createContext, useCallback, useContext, useEffect, useMemo, useState, type ReactNode } from 'react';
import { useOptionalServer } from '../../server/ServerContext.js';
import type {
@@ -8,23 +8,16 @@ import type {
AgentUIServer,
ConnectorCatalogEntry,
ConnectorState,
- ListResult,
ModelSelection,
} from '../../server/types.js';
import { getErrorMessage } from '../../utils/getErrorMessage.js';
-/** Picker page size for MCP infinite scroll. */
-export const MCP_CONNECTORS_PAGE_SIZE = 50;
-
type DraftCatalogValue = {
models: ModelSelection[];
skills: AgentSkill[];
connectors: ConnectorState[];
/** Connector logo URL keyed by connector name, sourced from the discovery catalog. */
connectorLogos: Record<string, string>;
- connectorsHasMore: boolean;
- connectorsLoadMoreFailed: boolean;
- connectorsLoadingMore: boolean;
loaded: boolean;
loading: boolean;
error: string | null;
@@ -34,8 +27,6 @@ type DraftCatalogValue = {
refresh: () => void;
/** Refresh connector auth state without reloading unrelated catalogs. */
refreshConnectors: () => Promise<void>;
- /** Append the next MCP page when `connectorsHasMore`. */
- loadMoreConnectors: () => void;
};
type DraftCatalogContextValue = DraftCatalogValue & {
@@ -56,36 +47,6 @@ function toConnectorLogos(entries: ConnectorCatalogEntry[]): Record<string, stri
return logos;
}
-function appendConnectors({
- previous,
- next,
-}: {
- previous: ConnectorState[];
- next: ConnectorState[];
-}): ConnectorState[] {
- if (next.length === 0) return previous;
- const seen = new Set(previous.map(connector => connector.id));
- const appended = next.filter(connector => !seen.has(connector.id));
- return appended.length === 0 ? previous : [...previous, ...appended];
-}
-
-async function fetchMcpPage({
- server,
- pageToken,
-}: {
- server: AgentUIServer;
- pageToken?: string;
-}): Promise<ListResult<ConnectorState>> {
- if (server.listMcp != null) {
- return server.listMcp({
- limit: MCP_CONNECTORS_PAGE_SIZE,
- ...(pageToken === undefined ? {} : { pageToken }),
- });
- }
- const data = await server.getMcp();
- return { data };
-}
-
export function DraftCatalogProvider({ children }: { children: ReactNode }) {
const server = useOptionalServer();
const existing = useContext(DraftCatalogContext);
@@ -101,26 +62,15 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
const [skills, setSkills] = useState<AgentSkill[]>([]);
const [connectors, setConnectors] = useState<ConnectorState[]>([]);
const [connectorLogos, setConnectorLogos] = useState<Record<string, string>>(EMPTY_LOGOS);
- const [connectorsNextPageToken, setConnectorsNextPageToken] = useState<string | undefined>(undefined);
- const [connectorsLoadMoreFailed, setConnectorsLoadMoreFailed] = useState(false);
- const [connectorsLoadingMore, setConnectorsLoadingMore] = useState(false);
const [completedEpoch, setCompletedEpoch] = useState<number | null>(null);
const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
- const connectorsNextPageTokenRef = useRef(connectorsNextPageToken);
- const connectorsLoadingMoreRef = useRef(connectorsLoadingMore);
- const loadMoreFailedRef = useRef(false);
- connectorsNextPageTokenRef.current = connectorsNextPageToken;
- connectorsLoadingMoreRef.current = connectorsLoadingMore;
-
const ensureLoaded = useCallback(() => {
setRequestEpoch(current => current ?? 0);
}, []);
const refresh = useCallback(() => {
- loadMoreFailedRef.current = false;
- setConnectorsLoadMoreFailed(false);
setRequestEpoch(current => (current ?? -1) + 1);
}, []);
@@ -128,12 +78,8 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
if (!server) return;
setLoading(true);
setError(null);
- loadMoreFailedRef.current = false;
- setConnectorsLoadMoreFailed(false);
try {
- const page = await fetchMcpPage({ server });
- setConnectors(page.data);
- setConnectorsNextPageToken(page.nextPageToken);
+ setConnectors(await server.getMcp());
} catch (reason: unknown) {
setError(getErrorMessage(reason, 'Failed to load connectors.'));
} finally {
@@ -141,47 +87,18 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
}
}, [server]);
- const loadMoreConnectors = useCallback(() => {
- if (!server) return;
- const pageToken = connectorsNextPageTokenRef.current;
- if (pageToken == null || pageToken.length === 0 || connectorsLoadingMoreRef.current) return;
-
- setConnectorsLoadMoreFailed(false);
- setConnectorsLoadingMore(true);
- void fetchMcpPage({ server, pageToken })
- .then(page => {
- setConnectors(previous => appendConnectors({ previous, next: page.data }));
- setConnectorsNextPageToken(page.nextPageToken);
- // Clear a stale load-more failure once a retry succeeds.
- if (loadMoreFailedRef.current) {
- loadMoreFailedRef.current = false;
- setError(null);
- }
- })
- .catch((reason: unknown) => {
- loadMoreFailedRef.current = true;
- setConnectorsLoadMoreFailed(true);
- setError(getErrorMessage(reason, 'Failed to load more connectors.'));
- })
- .finally(() => {
- setConnectorsLoadingMore(false);
- });
- }, [server]);
-
useEffect(() => {
if (requestEpoch === null || !server) return;
let cancelled = false;
setLoading(true);
setError(null);
- loadMoreFailedRef.current = false;
- setConnectorsLoadMoreFailed(false);
// Settle each list alone so one failing picker does not blank the others.
// Logos are cosmetic: a missing catalog port or a failed fetch just falls back to icons.
const connectorCatalog = server.catalog?.connectorCatalog;
void Promise.allSettled([
server.getModels(),
server.getSkills(),
- fetchMcpPage({ server }),
+ server.getMcp(),
connectorCatalog ? connectorCatalog.getConnectorCatalog() : Promise.resolve([]),
]).then(([modelsResult, skillsResult, mcpResult, catalogResult]) => {
if (cancelled) return;
@@ -198,8 +115,7 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
errors.push(getErrorMessage(skillsResult.reason, 'Failed to load skills.'));
}
if (mcpResult.status === 'fulfilled') {
- setConnectors(mcpResult.value.data);
- setConnectorsNextPageToken(mcpResult.value.nextPageToken);
+ setConnectors(mcpResult.value);
} else {
errors.push(getErrorMessage(mcpResult.reason, 'Failed to load connectors.'));
}
@@ -212,7 +128,6 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
};
}, [requestEpoch, server]);
- const connectorsHasMore = connectorsNextPageToken != null && connectorsNextPageToken.length > 0;
const loaded = requestEpoch !== null && completedEpoch === requestEpoch;
const value = useMemo(
() => ({
@@ -221,16 +136,12 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
skills,
connectors,
connectorLogos,
- connectorsHasMore,
- connectorsLoadMoreFailed,
- connectorsLoadingMore,
loaded,
loading,
error,
ensureLoaded,
refresh,
refreshConnectors,
- loadMoreConnectors,
}),
[
server,
@@ -238,16 +149,12 @@ function DraftCatalogStore({ server, children }: { server: AgentUIServer | null;
skills,
connectors,
connectorLogos,
- connectorsHasMore,
- connectorsLoadMoreFailed,
- connectorsLoadingMore,
loaded,
loading,
error,
ensureLoaded,
refresh,
refreshConnectors,
- loadMoreConnectors,
],
);
@@ -262,16 +169,12 @@ export function useDraftCatalog(): DraftCatalogValue {
skills: [],
connectors: [],
connectorLogos: EMPTY_LOGOS,
- connectorsHasMore: false,
- connectorsLoadMoreFailed: false,
- connectorsLoadingMore: false,
loaded: false,
loading: false,
error: null,
ensureLoaded: IDLE_ENSURE,
refresh: IDLE_ENSURE,
refreshConnectors: IDLE_REFRESH,
- loadMoreConnectors: IDLE_ENSURE,
};
}
return ctx;
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx b/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx
index 46b8eba15..bf25bc1fd 100644
--- a/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/DraftCompositeSelector.tsx
@@ -12,7 +12,6 @@ import { auiButtonClass } from '../lib/buttonClasses.js';
import { cn } from '../lib/cn.js';
import { useCompactLayout } from '../lib/CompactLayoutContext.js';
import { auiInputClass } from '../lib/inputClasses.js';
-import { useInfiniteScrollSentinel } from '../lib/useInfiniteScrollSentinel.js';
import { useIsMobile } from '../lib/useIsMobile.js';
import { BottomSheet } from '../primitives/BottomSheet.js';
import { Button } from '../primitives/Button.js';
@@ -240,18 +239,7 @@ function SectionHeading({ label, count }: { label: string; count: number }) {
}
export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftCompositeSelectorProps) {
- const {
- skills,
- connectors,
- connectorLogos,
- connectorsHasMore,
- connectorsLoadMoreFailed,
- connectorsLoadingMore,
- loading,
- ensureLoaded,
- refreshConnectors,
- loadMoreConnectors,
- } = useDraftCatalog();
+ const { skills, connectors, connectorLogos, loading, ensureLoaded, refreshConnectors } = useDraftCatalog();
const capabilities = useServerCapabilities();
const settingsCatalog = useOptionalCatalogServer();
const shell = useOptionalShellMode();
@@ -372,13 +360,6 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
useEffect(() => () => clearFlushTimer(), [clearFlushTimer]);
- const { listRef: connectorsListRef, sentinelRef: connectorsSentinelRef } = useInfiniteScrollSentinel({
- enabled: open && tab === 'connectors',
- hasMore: connectorsHasMore && !connectorsLoadMoreFailed,
- loading: connectorsLoadingMore || loading,
- onLoadMore: loadMoreConnectors,
- });
-
const catalogConnectors = useMemo(
() => connectorsWithSelectedStubs({ connectors, selected: selectedMcp }),
[connectors, selectedMcp],
@@ -515,10 +496,7 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
<span className="text-xs leading-none">{skillsDisabledReason}</span>
</div>
) : null}
- <div
- ref={tab === 'connectors' ? connectorsListRef : undefined}
- className="min-h-0 flex-1 overflow-y-auto px-1 pb-2"
- >
+ <div className="min-h-0 flex-1 overflow-y-auto px-1 pb-2">
{tab === 'connectors' ? (
<>
{pinnedSelectedConnectors.length > 0 ? (
@@ -572,24 +550,6 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftC
onOpenSettings={shell && canConfigureConnectors ? () => openSettings('connectors') : undefined}
/>
) : null}
- {connectorsHasMore ? (
- <div
- ref={connectorsLoadMoreFailed ? undefined : connectorsSentinelRef}
- className="flex h-8 items-center justify-center"
- >
- {connectorsLoadMoreFailed ? (
- <button
- type="button"
- className={auiButtonClass({ variant: 'ghost', size: 'small' })}
- onClick={loadMoreConnectors}
- >
- Retry loading connectors
- </button>
- ) : connectorsLoadingMore ? (
- <span className="text-text-secondary text-[0.625rem]">Loading…</span>
- ) : null}
- </div>
- ) : null}
</>
) : (
<>
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftSpecPreferenceBridge.tsx b/packages/trueforge-ui/src/atoms/draft/DraftSpecPreferenceBridge.tsx
index 913fc898a..110bb9c07 100644
--- a/packages/trueforge-ui/src/atoms/draft/DraftSpecPreferenceBridge.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/DraftSpecPreferenceBridge.tsx
@@ -34,15 +34,12 @@ export function reconcileDraftSpecPreferences({
models,
skills,
connectors,
- connectorsHasMore = false,
skillsEnabled,
}: {
agentSpec: AgentSpec;
models: ModelSelection[];
skills: AgentSkill[];
connectors: ConnectorState[];
- /** When more MCP pages remain, off-page selections must not be treated as deleted. */
- connectorsHasMore?: boolean;
skillsEnabled: boolean | undefined;
}): Partial<AgentSpec> {
const update: Partial<AgentSpec> = {};
@@ -58,12 +55,9 @@ export function reconcileDraftSpecPreferences({
}
}
- // Paginated catalogs only include loaded pages — prune MCP only once the full list is known.
- if (!connectorsHasMore) {
- const nextMcpServers = filterMounts(agentSpec.mcpServers, new Set(connectors.map(connector => connector.name)));
- if (nextMcpServers !== agentSpec.mcpServers) {
- update.mcpServers = nextMcpServers;
- }
+ const nextMcpServers = filterMounts(agentSpec.mcpServers, new Set(connectors.map(connector => connector.name)));
+ if (nextMcpServers !== agentSpec.mcpServers) {
+ update.mcpServers = nextMcpServers;
}
if (skillsEnabled === false) {
@@ -128,7 +122,7 @@ export function DraftSpecPreferenceBridge() {
const updateAgentSpec = useTrueFoundryUpdateAgentSpec();
const capabilities = useServerCapabilities();
const sandboxEnabled = capabilities?.sandbox.enabled;
- const { models, skills, connectors, connectorsHasMore, loaded, error, ensureLoaded } = useDraftCatalog();
+ const { models, skills, connectors, loaded, error, ensureLoaded } = useDraftCatalog();
const isPlainDraft = mode.status === 'active' && mode.isMutable && mode.agentId == null && pendingSessionId == null;
const preferenceKind = mode.status === 'active' && mode.isMutable && mode.isCreateAgent ? 'agent' : 'chat';
@@ -159,7 +153,6 @@ export function DraftSpecPreferenceBridge() {
models,
skills,
connectors,
- connectorsHasMore,
skillsEnabled: capabilities?.skill.enabled,
});
if (Object.keys(update).length > 0) {
@@ -169,7 +162,6 @@ export function DraftSpecPreferenceBridge() {
agentSpec,
capabilities?.skill.enabled,
connectors,
- connectorsHasMore,
error,
isPlainDraft,
loaded,
diff --git a/packages/trueforge-ui/src/atoms/lib/useInfiniteScrollSentinel.ts b/packages/trueforge-ui/src/atoms/lib/useInfiniteScrollSentinel.ts
deleted file mode 100644
index 1bddb202a..000000000
--- a/packages/trueforge-ui/src/atoms/lib/useInfiniteScrollSentinel.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-'use client';
-
-import { useCallback, useEffect, useRef, useState } from 'react';
-
-// IntersectionObserver only accepts px/% — not rem (3rem @ 16px).
-const DEFAULT_ROOT_MARGIN = '48px';
-
-export type UseInfiniteScrollSentinelOptions = {
- enabled: boolean;
- hasMore: boolean;
- loading: boolean;
- onLoadMore: () => void;
- rootMargin?: string;
-};
-
-/**
- * IntersectionObserver sentinel for linear infinite-scroll lists.
- * Attach `listRef` to the scroll container and `sentinelRef` to a footer element.
- * Re-observes when `hasMore` / `loading` change so a still-visible sentinel (short
- * filtered lists) continues requesting pages after each load settles.
- */
-export function useInfiniteScrollSentinel({
- enabled,
- hasMore,
- loading,
- onLoadMore,
- rootMargin = DEFAULT_ROOT_MARGIN,
-}: UseInfiniteScrollSentinelOptions): {
- listRef: (node: HTMLElement | null) => void;
- sentinelRef: (node: HTMLElement | null) => void;
-} {
- const onLoadMoreRef = useRef(onLoadMore);
- onLoadMoreRef.current = onLoadMore;
-
- const [listEl, setListEl] = useState<HTMLElement | null>(null);
- const [sentinelEl, setSentinelEl] = useState<HTMLElement | null>(null);
-
- const listRef = useCallback((node: HTMLElement | null) => {
- setListEl(node);
- }, []);
-
- const sentinelRef = useCallback((node: HTMLElement | null) => {
- setSentinelEl(node);
- }, []);
-
- useEffect(() => {
- if (!enabled || !hasMore || loading || listEl == null || sentinelEl == null) return;
-
- const observer = new IntersectionObserver(
- entries => {
- if (!entries.some(entry => entry.isIntersecting)) return;
- onLoadMoreRef.current();
- },
- { root: listEl, rootMargin },
- );
- observer.observe(sentinelEl);
- return () => observer.disconnect();
- }, [enabled, hasMore, loading, listEl, sentinelEl, rootMargin]);
-
- return { listRef, sentinelRef };
-}
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 722baada3..d26acece6 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
@@ -3,17 +3,11 @@
* Composer pickers + agent library backed by the Harness agents registry.
*/
import type { TrueForge, TrueForgeApi } from '@truefoundry/trueforge-sdk';
-import type {
- AgentBuilderServer,
- AgentLibraryEntry,
- ModelSelection,
- PageParams,
- SearchAgentsParams,
-} from '../../server/types.js';
+import type { AgentBuilderServer, AgentLibraryEntry, ModelSelection, SearchAgentsParams } from '../../server/types.js';
import { toUiConnectorFromReadEntry, toUiTool } from './catalogs/connectorCatalog.js';
import { toHarnessAgentSpec, toUiAgentSpec } from './chatServer.js';
import { createTrueForgeClient, type CreateTrueForgeClientOptions } from './client.js';
-import { listConfiguredMcpServers, listConfiguredMcpServersPage, listSkills } from './lists.js';
+import { listConfiguredMcpServers, listSkills } from './lists.js';
import type { HarnessAgentSpec } from './types.js';
export type CreateHarnessBuilderServerOptions = CreateTrueForgeClientOptions & {
@@ -94,13 +88,6 @@ export function createHarnessBuilderServer(
return skills.map(skill => ({ id: skill.name, name: skill.name, description: skill.description }));
},
getMcp: async () => (await listConfiguredMcpServers(client)).map(toUiConnectorFromReadEntry),
- listMcp: async (req?: PageParams) => {
- const page = await listConfiguredMcpServersPage(client, req ?? {});
- return {
- data: page.data.map(toUiConnectorFromReadEntry),
- ...(page.nextPageToken === undefined ? {} : { nextPageToken: page.nextPageToken }),
- };
- },
getMcpTools: async ({ connectorId }: { connectorId: string }) => {
const body = await client.mcpServers.listTools(connectorId);
return body.data.flatMap(tool =>
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/index.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/index.ts
index 5cba91f8e..6dfa11ee2 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/index.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/index.ts
@@ -56,13 +56,7 @@ export {
} from './chatServer.js';
export { createTrueForgeClient } from './client.js';
export type { CreateTrueForgeClientOptions } from './client.js';
-export {
- getCapabilities,
- listConfiguredMcpServers,
- listConfiguredMcpServersPage,
- listModels,
- listSkills,
-} from './lists.js';
+export { getCapabilities, listConfiguredMcpServers, listModels, listSkills } from './lists.js';
export { createScheduleServer } from './schedules/scheduleServer.js';
export type { HarnessAgentSpec, HarnessMcpServerMount, HarnessSkillMount } from './types.js';
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/lists.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/lists.ts
index 8c060c6b6..663fbdf32 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/lists.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/lists.ts
@@ -4,31 +4,14 @@
*/
import type { TrueForge, TrueForgeApi } from '@truefoundry/trueforge-sdk';
-import type { ListResult, PageParams } from '../../server/types.js';
-import { drainListPages } from '../../utils/drainListPages.js';
-import { toListResult } from './chatServer.js';
-
export async function listModels(client: TrueForge): Promise<TrueForgeApi.AvailableModel[]> {
const body = await client.models.list();
return body.data;
}
-export async function listConfiguredMcpServersPage(
- client: TrueForge,
- req: PageParams = {},
-): Promise<ListResult<TrueForgeApi.AvailableMcpServer>> {
- const page = await client.mcpServers.list({
- ...(req.limit === undefined ? {} : { limit: req.limit }),
- ...(req.pageToken === undefined ? {} : { pageToken: req.pageToken }),
- });
- return toListResult(page, server => server);
-}
-
-/** Drain every MCP page (full catalog for non-picker callers). */
export async function listConfiguredMcpServers(client: TrueForge): Promise<TrueForgeApi.AvailableMcpServer[]> {
- return drainListPages({
- fetchPage: pageToken => listConfiguredMcpServersPage(client, { pageToken }),
- });
+ const body = await client.mcpServers.list();
+ return body.data;
}
export async function listSkills(client: TrueForge): Promise<TrueForgeApi.AvailableSkill[]> {
diff --git a/packages/trueforge-ui/src/server/createTrueFoundryServer.ts b/packages/trueforge-ui/src/server/createTrueFoundryServer.ts
index 369878cf0..5c5e30b62 100644
--- a/packages/trueforge-ui/src/server/createTrueFoundryServer.ts
+++ b/packages/trueforge-ui/src/server/createTrueFoundryServer.ts
@@ -9,9 +9,7 @@ import type {
AgentSpec,
CatalogServer,
ConnectorState,
- ListResult,
ModelSelection,
- PageParams,
SaveAgentRequest,
SaveAgentResult,
ScheduleServer,
@@ -37,7 +35,6 @@ export type CreateTrueFoundryServerOptions<
getModels: () => Promise<TModel[]>;
getSkills: () => Promise<TSkill[]>;
getMcp: () => Promise<TMcp[]>;
- listMcp?: (req?: PageParams) => Promise<ListResult<TMcp>>;
getMcpTools?: AgentBuilderServer<TSpec, TModel, TSkill, TMcp, TAgent, TSave, TCapabilities>['getMcpTools'];
searchAgents: (req?: SearchAgentsParams) => Promise<TAgent[]>;
saveAgent: (req: SaveAgentRequest<TSpec>) => Promise<TSave>;
@@ -121,7 +118,6 @@ export function createTrueFoundryServer<
getModels: opts.getModels,
getSkills: opts.getSkills,
getMcp: opts.getMcp,
- ...(opts.listMcp === undefined ? {} : { listMcp: opts.listMcp }),
...(opts.getMcpTools === undefined ? {} : { getMcpTools: opts.getMcpTools }),
searchAgents: opts.searchAgents,
saveAgent: opts.saveAgent,
diff --git a/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx
index 7a0875e50..0959b307f 100644
--- a/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx
@@ -6,6 +6,41 @@ import { AgentMcpEditorContent } from '@/atoms/draft/AgentMcpEditorContent.js';
import { SlotsProvider } from '@/theme/SlotsProvider.js';
describe('AgentMcpEditorContent tool search', () => {
+ it('filters the complete MCP connector list by name and description', () => {
+ const props = {
+ spec: { model: { name: 'openai/gpt' } },
+ connectors: [
+ { id: 'github', name: 'GitHub', description: 'Source control', authenticated: true },
+ { id: 'linear', name: 'Linear', description: 'Issue tracking', authenticated: true },
+ ],
+ activeConnectorId: 'github',
+ tools: [],
+ toolsLoading: false,
+ toolsError: null,
+ onQueryChange: vi.fn(),
+ onSelectConnector: vi.fn(),
+ onRetryTools: vi.fn(),
+ onChange: vi.fn(),
+ };
+ const view = render(
+ <SlotsProvider>
+ <AgentMcpEditorContent {...props} query="" />
+ </SlotsProvider>,
+ );
+
+ expect(screen.getByRole('button', { name: 'GitHub' })).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Linear' })).toBeInTheDocument();
+
+ view.rerender(
+ <SlotsProvider>
+ <AgentMcpEditorContent {...props} query="issue" />
+ </SlotsProvider>,
+ );
+
+ expect(screen.queryByRole('button', { name: 'GitHub' })).not.toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Linear' })).toBeInTheDocument();
+ });
+
it('filters the tool list as the user types in Search Tools', () => {
render(
<SlotsProvider>
diff --git a/packages/trueforge-ui/test/atoms/draft/DraftCatalogProvider.test.tsx b/packages/trueforge-ui/test/atoms/draft/DraftCatalogProvider.test.tsx
index 88bf33e9b..8d5c9c8fc 100644
--- a/packages/trueforge-ui/test/atoms/draft/DraftCatalogProvider.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/DraftCatalogProvider.test.tsx
@@ -22,15 +22,9 @@ function CatalogProbe() {
<button type="button" onClick={() => void catalog.refreshConnectors()}>
Refresh connectors
</button>
- <button type="button" onClick={() => catalog.loadMoreConnectors()}>
- Load more connectors
- </button>
<output data-testid="models">{catalog.models.map(model => model.name).join(',')}</output>
<output data-testid="skills">{catalog.skills.map(skill => skill.name).join(',')}</output>
<output data-testid="connectors">{catalog.connectors.map(connector => connector.name).join(',')}</output>
- <output data-testid="connectors-has-more">{String(catalog.connectorsHasMore)}</output>
- <output data-testid="connectors-load-more-failed">{String(catalog.connectorsLoadMoreFailed)}</output>
- <output data-testid="connectors-loading-more">{String(catalog.connectorsLoadingMore)}</output>
<output data-testid="loading">{String(catalog.loading)}</output>
<output data-testid="error">{catalog.error ?? ''}</output>
</div>
@@ -150,20 +144,19 @@ describe('DraftCatalogProvider', () => {
});
});
- it('keeps off-page MCP mounts while more connector pages remain', () => {
+ it('prunes MCP mounts missing from the complete connector catalog', () => {
const update = reconcileDraftSpecPreferences({
agentSpec: {
model: { name: 'live/model' },
- mcpServers: [{ name: 'Available MCP' }, { name: 'Off-page MCP' }],
+ mcpServers: [{ name: 'Available MCP' }, { name: 'Removed MCP' }],
},
models: [{ id: 'live/model', name: 'live/model', provider: { name: 'Live' }, properties: {} }],
skills: [],
connectors: [{ id: 'available-mcp', name: 'Available MCP' }],
- connectorsHasMore: true,
skillsEnabled: true,
});
- expect(update).toEqual({});
+ expect(update).toEqual({ mcpServers: [{ name: 'Available MCP' }] });
});
it('clears remembered skills when skills are unavailable', () => {
@@ -399,76 +392,4 @@ describe('DraftCatalogProvider', () => {
expect(innerGetModels).toHaveBeenCalledOnce();
expect(outerGetModels).not.toHaveBeenCalled();
});
-
- it('loads the first MCP page via listMcp and appends on loadMoreConnectors', async () => {
- const listMcp = vi
- .fn()
- .mockResolvedValueOnce({
- data: [{ id: 'a', name: 'Alpha' }],
- nextPageToken: 'page-2',
- })
- .mockResolvedValueOnce({
- data: [{ id: 'b', name: 'Beta' }],
- });
- const getMcp = vi.fn(async (): Promise<ConnectorState[]> => {
- throw new Error('getMcp should not run when listMcp is present');
- });
- const server = createMockAgentUIServer({ listMcp, getMcp });
-
- render(
- <ServerProvider server={server}>
- <DraftCatalogProvider>
- <CatalogProbe />
- </DraftCatalogProvider>
- </ServerProvider>,
- );
-
- fireEvent.click(screen.getByRole('button', { name: 'Load catalog' }));
-
- await waitFor(() => expect(screen.getByTestId('connectors')).toHaveTextContent('Alpha'));
- expect(screen.getByTestId('connectors-has-more')).toHaveTextContent('true');
- expect(listMcp).toHaveBeenCalledWith({ limit: 50 });
- expect(getMcp).not.toHaveBeenCalled();
-
- fireEvent.click(screen.getByRole('button', { name: 'Load more connectors' }));
-
- await waitFor(() => expect(screen.getByTestId('connectors')).toHaveTextContent('Alpha,Beta'));
- expect(screen.getByTestId('connectors-has-more')).toHaveTextContent('false');
- expect(listMcp).toHaveBeenCalledWith({ limit: 50, pageToken: 'page-2' });
- });
-
- it('stops automatic pagination after failure and allows an explicit retry', async () => {
- const listMcp = vi
- .fn()
- .mockResolvedValueOnce({
- data: [{ id: 'a', name: 'Alpha' }],
- nextPageToken: 'page-2',
- })
- .mockRejectedValueOnce(new Error('Page unavailable'))
- .mockResolvedValueOnce({
- data: [{ id: 'b', name: 'Beta' }],
- });
- const server = createMockAgentUIServer({ listMcp });
-
- render(
- <ServerProvider server={server}>
- <DraftCatalogProvider>
- <CatalogProbe />
- </DraftCatalogProvider>
- </ServerProvider>,
- );
-
- fireEvent.click(screen.getByRole('button', { name: 'Load catalog' }));
- await waitFor(() => expect(screen.getByTestId('connectors')).toHaveTextContent('Alpha'));
-
- fireEvent.click(screen.getByRole('button', { name: 'Load more connectors' }));
- await waitFor(() => expect(screen.getByTestId('connectors-load-more-failed')).toHaveTextContent('true'));
- expect(screen.getByTestId('connectors-has-more')).toHaveTextContent('true');
- expect(listMcp).toHaveBeenCalledTimes(2);
-
- fireEvent.click(screen.getByRole('button', { name: 'Load more connectors' }));
- await waitFor(() => expect(screen.getByTestId('connectors')).toHaveTextContent('Alpha,Beta'));
- expect(screen.getByTestId('connectors-load-more-failed')).toHaveTextContent('false');
- expect(listMcp).toHaveBeenCalledTimes(3);
- });
});
diff --git a/packages/trueforge-ui/test/atoms/draft/DraftCompositeSelector.test.tsx b/packages/trueforge-ui/test/atoms/draft/DraftCompositeSelector.test.tsx
index f68d290b6..6d7705acb 100644
--- a/packages/trueforge-ui/test/atoms/draft/DraftCompositeSelector.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/DraftCompositeSelector.test.tsx
@@ -136,6 +136,20 @@ describe('DraftCompositeSelector', () => {
'dark:bg-primary-bg',
);
});
+
+ it('filters the complete connector catalog client-side', async () => {
+ renderSelector();
+ fireEvent.click(screen.getByRole('button', { name: 'Tools (2)' }));
+
+ expect(await screen.findByRole('menuitemcheckbox', { name: /GitHub/ })).toBeInTheDocument();
+ expect(screen.getByRole('menuitemcheckbox', { name: /Slack/ })).toBeInTheDocument();
+
+ fireEvent.change(screen.getByPlaceholderText('Search connectors...'), { target: { value: 'git' } });
+
+ expect(screen.getByRole('menuitemcheckbox', { name: /GitHub/ })).toBeInTheDocument();
+ expect(screen.queryByRole('menuitemcheckbox', { name: /Slack/ })).not.toBeInTheDocument();
+ });
+
it('shows selected connectors and skills in the Tools tooltip', () => {
renderSelector();
fireEvent.mouseEnter(screen.getByRole('button', { name: 'Tools (2)' }));
diff --git a/packages/trueforge-ui/test/atoms/lib/useInfiniteScrollSentinel.test.tsx b/packages/trueforge-ui/test/atoms/lib/useInfiniteScrollSentinel.test.tsx
deleted file mode 100644
index ad9e8e35b..000000000
--- a/packages/trueforge-ui/test/atoms/lib/useInfiniteScrollSentinel.test.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-// @vitest-environment jsdom
-import { act, render, waitFor } from '@testing-library/react';
-import { useEffect, useState, type ReactElement } from 'react';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { useInfiniteScrollSentinel } from '@/atoms/lib/useInfiniteScrollSentinel.js';
-
-type ObserverCallback = IntersectionObserverCallback;
-
-let observerCallback: ObserverCallback | null = null;
-const observe = vi.fn();
-const disconnect = vi.fn();
-
-const observerStub: IntersectionObserver = {
- observe,
- unobserve: vi.fn(),
- disconnect,
- takeRecords: () => [],
- root: null,
- rootMargin: '',
- thresholds: [],
-};
-
-let lastRootMargin: string | undefined;
-
-class FakeIntersectionObserver implements IntersectionObserver {
- constructor(callback: ObserverCallback, options?: IntersectionObserverInit) {
- observerCallback = callback;
- lastRootMargin = options?.rootMargin;
- }
- observe = observe;
- unobserve = vi.fn();
- disconnect = disconnect;
- takeRecords = () => [];
- root: Element | Document | null = null;
- rootMargin = '';
- thresholds: ReadonlyArray<number> = [];
-}
-
-const intersectionEntry = (): IntersectionObserverEntry => ({
- boundingClientRect: new DOMRect(),
- intersectionRatio: 1,
- intersectionRect: new DOMRect(),
- isIntersecting: true,
- rootBounds: null,
- target: document.createElement('div'),
- time: 0,
-});
-
-function Probe({
- hasMore,
- loading,
- onLoadMore,
-}: {
- hasMore: boolean;
- loading: boolean;
- onLoadMore: () => void;
-}): ReactElement {
- const { listRef, sentinelRef } = useInfiniteScrollSentinel({
- enabled: true,
- hasMore,
- loading,
- onLoadMore,
- });
- return (
- <div>
- <div ref={listRef} data-testid="list" />
- <div ref={sentinelRef} data-testid="sentinel" />
- </div>
- );
-}
-
-function ControlledProbe({ onLoadMore }: { onLoadMore: () => void }): ReactElement {
- const [loading, setLoading] = useState(false);
- const [pages, setPages] = useState(0);
- const hasMore = pages < 2;
-
- useEffect(() => {
- if (!loading) return;
- const timer = window.setTimeout(() => {
- setPages(current => current + 1);
- setLoading(false);
- }, 0);
- return () => window.clearTimeout(timer);
- }, [loading]);
-
- return (
- <Probe
- hasMore={hasMore}
- loading={loading}
- onLoadMore={() => {
- onLoadMore();
- setLoading(true);
- }}
- />
- );
-}
-
-describe('useInfiniteScrollSentinel', () => {
- beforeEach(() => {
- observerCallback = null;
- lastRootMargin = undefined;
- observe.mockClear();
- disconnect.mockClear();
- vi.stubGlobal('IntersectionObserver', FakeIntersectionObserver);
- });
-
- afterEach(() => {
- vi.unstubAllGlobals();
- });
-
- it('passes a px/percent rootMargin (IntersectionObserver rejects rem)', async () => {
- render(<Probe hasMore loading={false} onLoadMore={() => undefined} />);
- await waitFor(() => expect(observe).toHaveBeenCalled());
- expect(lastRootMargin).toMatch(/^-?\d+(\.\d+)?(px|%)(\s+-?\d+(\.\d+)?(px|%)){0,3}$/);
- });
-
- it('re-observes after loading settles so a still-visible sentinel can load again', async () => {
- const onLoadMore = vi.fn();
- render(<ControlledProbe onLoadMore={onLoadMore} />);
-
- await waitFor(() => expect(observe).toHaveBeenCalled());
- act(() => {
- observerCallback?.([intersectionEntry()], observerStub);
- });
-
- await waitFor(() => expect(onLoadMore).toHaveBeenCalledTimes(1));
- await waitFor(() => expect(observe.mock.calls.length).toBeGreaterThan(1));
-
- act(() => {
- observerCallback?.([intersectionEntry()], observerStub);
- });
-
- await waitFor(() => expect(onLoadMore).toHaveBeenCalledTimes(2));
- });
-});
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 5d4ff4a2e..3873e69e2 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
@@ -378,46 +378,7 @@ describe('harnessBuilderServer', () => {
assert.equal(requests[0]?.method, 'GET');
});
- it('listMcp maps a page and preserves nextPageToken', async () => {
- const urls: string[] = [];
- const fetchMock: typeof fetch = async input => {
- const url = input instanceof Request ? input.url : String(input);
- urls.push(url);
- if (url.includes('/api/v1/mcp-servers')) {
- return Response.json({
- data: [
- {
- name: 'linear',
- url: 'https://mcp.linear.app/mcp',
- auth: { type: 'dcr' },
- auth_status: { status: 'authenticated' },
- },
- ],
- pagination: { limit: 50, next_page_token: 'tok-2' },
- });
- }
- return new Response(`Unexpected request: ${url}`, { status: 500 });
- };
-
- const builder = createHarnessBuilderServer({ fetch: fetchMock });
- assert.ok(builder.listMcp);
- const page = await builder.listMcp({ limit: 50 });
- assert.deepEqual(page.data, [
- {
- id: 'linear',
- name: 'linear',
- description: 'https://mcp.linear.app/mcp',
- url: 'https://mcp.linear.app/mcp',
- auth: { type: 'dcr' },
- requiresAuth: false,
- authenticated: true,
- },
- ]);
- assert.equal(page.nextPageToken, 'tok-2');
- assert.ok(urls[0]?.includes('limit=50'));
- });
-
- it('getMcp drains every page', async () => {
+ it('getMcp returns the complete catalog in one request', async () => {
let calls = 0;
const fetchMock: typeof fetch = async input => {
const url = input instanceof Request ? input.url : String(input);
@@ -425,27 +386,19 @@ describe('harnessBuilderServer', () => {
return new Response(`Unexpected request: ${url}`, { status: 500 });
}
calls += 1;
- if (calls === 1) {
- return Response.json({
- data: [
- {
- name: 'a',
- url: 'https://a.example/mcp',
- auth_status: { status: 'authenticated' },
- },
- ],
- pagination: { limit: 100, next_page_token: 'next' },
- });
- }
return Response.json({
data: [
+ {
+ name: 'a',
+ url: 'https://a.example/mcp',
+ auth_status: { status: 'authenticated' },
+ },
{
name: 'b',
url: 'https://b.example/mcp',
auth_status: { status: 'authenticated' },
},
],
- pagination: { limit: 100 },
});
};
@@ -455,6 +408,6 @@ describe('harnessBuilderServer', () => {
all.map(row => row.name),
['a', 'b'],
);
- assert.equal(calls, 2);
+ assert.equal(calls, 1);
});
});
diff --git a/packages/trueforge/src/apis/mcpServers.ts b/packages/trueforge/src/apis/mcpServers.ts
index 42ad71025..d2a612746 100644
--- a/packages/trueforge/src/apis/mcpServers.ts
+++ b/packages/trueforge/src/apis/mcpServers.ts
@@ -1,5 +1,4 @@
import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';
-import { InvalidPageTokenError } from '@truefoundry/trueforge-core/agent-session';
import { extractErrorLogFields, isAuthRequired, McpConnectionError, RemoteMCP } from '@truefoundry/trueforge-core/core';
import type { Context } from 'hono';
import { HTTPException } from 'hono/http-exception';
@@ -148,30 +147,20 @@ export function createSettingsMcpServersRouter<TTransaction>(deps: McpServersRou
const listHandler: RouteHandler<typeof listMcpServersRoute> = async c => {
const requestContext = deps.resolveRequestContext(c);
const userRef = requestContext.subject.id;
- const { limit, page_token: pageToken } = c.req.valid('query');
- try {
- const { data: records, pagination } = await deps.resolveMcpServerStore(c).listServers({
- tenant_id: requestContext.tenant_id,
- names: undefined,
- limit,
- page_token: pageToken,
- });
- const statuses = await deps.resolveMcpServerStore(c).resolveAuthStatuses({
- records,
- userRef,
- });
- const data: ConfiguredMcpServer[] = records.map(record => ({
- name: record.name,
- manifest: redactMcpServerManifest(record.manifest),
- auth_status: statuses.get(record.name) ?? { status: 'auth_required' },
- }));
- return c.json({ data, pagination }, 200);
- } catch (error) {
- if (error instanceof InvalidPageTokenError) {
- return c.json({ error: { message: error.message } }, 400);
- }
- throw error;
- }
+ const records = await deps.resolveMcpServerStore(c).listServers({
+ tenant_id: requestContext.tenant_id,
+ names: undefined,
+ });
+ const statuses = await deps.resolveMcpServerStore(c).resolveAuthStatuses({
+ records,
+ userRef,
+ });
+ const data: ConfiguredMcpServer[] = records.map(record => ({
+ name: record.name,
+ manifest: redactMcpServerManifest(record.manifest),
+ auth_status: statuses.get(record.name) ?? { status: 'auth_required' },
+ }));
+ return c.json({ data }, 200);
};
const getHandler: RouteHandler<typeof getMcpServerRoute> = async c => {
@@ -512,31 +501,21 @@ export function createMcpServersRouter<TTransaction>(deps: McpServersRouterDeps<
router.openapi(listAvailableMcpServersRoute, async c => {
const requestContext = deps.resolveRequestContext(c);
const userRef = requestContext.subject.id;
- const { limit, page_token: pageToken } = c.req.valid('query');
- try {
- const { data: records, pagination } = await deps.resolveMcpServerStore(c).listServers({
- tenant_id: requestContext.tenant_id,
- names: undefined,
- limit,
- page_token: pageToken,
- });
- const statuses = await deps.resolveMcpServerStore(c).resolveAuthStatuses({
- records,
- userRef,
- });
- const data: AvailableMcpServer[] = records.map(record =>
- toAvailableMcpServer({
- record,
- authStatus: statuses.get(record.name) ?? { status: 'auth_required' },
- }),
- );
- return c.json({ data, pagination }, 200);
- } catch (error) {
- if (error instanceof InvalidPageTokenError) {
- return c.json({ error: { message: error.message } }, 400);
- }
- throw error;
- }
+ const records = await deps.resolveMcpServerStore(c).listServers({
+ tenant_id: requestContext.tenant_id,
+ names: undefined,
+ });
+ const statuses = await deps.resolveMcpServerStore(c).resolveAuthStatuses({
+ records,
+ userRef,
+ });
+ const data: AvailableMcpServer[] = records.map(record =>
+ toAvailableMcpServer({
+ record,
+ authStatus: statuses.get(record.name) ?? { status: 'auth_required' },
+ }),
+ );
+ return c.json({ data }, 200);
});
router.openapi(listMcpServerToolsRoute, listToolsHandler);
router.openapi(authorizeMcpServerRoute, authorizeHandler);
diff --git a/packages/trueforge/src/db/McpServerWithAuthStore.ts b/packages/trueforge/src/db/McpServerWithAuthStore.ts
index b9f8060bf..027a40423 100644
--- a/packages/trueforge/src/db/McpServerWithAuthStore.ts
+++ b/packages/trueforge/src/db/McpServerWithAuthStore.ts
@@ -1,4 +1,3 @@
-import type { TokenPagination } from '@truefoundry/trueforge-core/agent-session';
import type { RemoteMcpHeaders } from '@truefoundry/trueforge-core/core';
import { isMcpAuthRequired, resolveMcpAuth } from '../mcp/auth/mcpDcr';
import type { IOAuthTokenStore, OAuthClientRecord } from '../mcp/auth/types';
@@ -32,10 +31,7 @@ export class McpServerWithAuthStore<TTransaction = never> implements IMcpServerW
this.#clientName = input.clientName;
}
- listServers(
- input: ListMcpServersInput,
- transaction?: TTransaction,
- ): Promise<{ data: McpServerRecord[]; pagination: TokenPagination }> {
+ listServers(input: ListMcpServersInput, transaction?: TTransaction): Promise<McpServerRecord[]> {
return this.#store.listServers(input, transaction);
}
diff --git a/packages/trueforge/src/db/mcpServerStore.ts b/packages/trueforge/src/db/mcpServerStore.ts
index 936a1c51b..3ed4fe735 100644
--- a/packages/trueforge/src/db/mcpServerStore.ts
+++ b/packages/trueforge/src/db/mcpServerStore.ts
@@ -1,4 +1,3 @@
-import type { TokenPagination } from '@truefoundry/trueforge-core/agent-session';
import type { RemoteMcpHeaders } from '@truefoundry/trueforge-core/core';
import type {
OAuthClientRecord as ContractOAuthClientRecord,
@@ -29,8 +28,6 @@ export interface ListMcpServersInput {
tenant_id: string;
/** `undefined` lists all; empty yields no rows without querying. */
names: readonly string[] | undefined;
- limit: number;
- page_token: string | undefined;
}
export interface CreateMcpServerInput {
@@ -87,10 +84,7 @@ export interface DeleteMcpAuthorizationInput {
/** Row persistence + DCR client columns — no authorize/status/revoke. */
export interface IMcpServerStore<TTransaction = never> extends IOAuthClientStore<TTransaction> {
- listServers(
- input: ListMcpServersInput,
- transaction?: TTransaction,
- ): Promise<{ data: McpServerRecord[]; pagination: TokenPagination }>;
+ listServers(input: ListMcpServersInput, transaction?: TTransaction): Promise<McpServerRecord[]>;
getServer(input: GetMcpServerInput, transaction?: TTransaction): Promise<McpServerRecord | undefined>;
/**
* Load one server while holding a row lock for the lifetime of `transaction`.
diff --git a/packages/trueforge/src/db/postgres/mcp-server-store/PostgresMcpServerStore.ts b/packages/trueforge/src/db/postgres/mcp-server-store/PostgresMcpServerStore.ts
index 43680f141..148531257 100644
--- a/packages/trueforge/src/db/postgres/mcp-server-store/PostgresMcpServerStore.ts
+++ b/packages/trueforge/src/db/postgres/mcp-server-store/PostgresMcpServerStore.ts
@@ -1,8 +1,3 @@
-import type { TokenPagination } from '@truefoundry/trueforge-core/agent-session';
-import {
- decodeOffsetPageToken,
- paginateOffsetRows,
-} from '@truefoundry/trueforge-core/agent-session/store/OffsetPageToken';
import type { Kysely, Selectable, Transaction } from 'kysely';
import type { OAuthClientRecord } from '../../../mcp/auth/types';
import { newId } from '../../../utils/id';
@@ -39,26 +34,17 @@ export class PostgresMcpServerStore implements IMcpServerStore<Transaction<Datab
this.#db = db;
}
- async listServers(
- input: ListMcpServersInput,
- transaction?: Transaction<Database>,
- ): Promise<{ data: McpServerRecord[]; pagination: TokenPagination }> {
- const offset = decodeOffsetPageToken(input.page_token);
+ async listServers(input: ListMcpServersInput, transaction?: Transaction<Database>): Promise<McpServerRecord[]> {
if (input.names?.length === 0) {
- return paginateOffsetRows([], input.limit, offset);
+ return [];
}
const db = transaction ?? this.#db;
let query = db.selectFrom('mcp_server').selectAll().where('tenant_id', '=', input.tenant_id);
if (input.names !== undefined) {
query = query.where('name', 'in', [...input.names]);
}
- const rows = await query
- .orderBy('name')
- .limit(input.limit + 1)
- .offset(offset)
- .execute();
- const { data, pagination } = paginateOffsetRows(rows, input.limit, offset);
- return { data: data.map(toRecord), pagination };
+ const rows = await query.orderBy('name').execute();
+ return rows.map(toRecord);
}
async getServer(input: GetMcpServerInput, transaction?: Transaction<Database>): Promise<McpServerRecord | undefined> {
diff --git a/packages/trueforge/src/db/sqlite/mcp-server-store/SqliteMcpServerStore.ts b/packages/trueforge/src/db/sqlite/mcp-server-store/SqliteMcpServerStore.ts
index 1829e7e86..a4e13824c 100644
--- a/packages/trueforge/src/db/sqlite/mcp-server-store/SqliteMcpServerStore.ts
+++ b/packages/trueforge/src/db/sqlite/mcp-server-store/SqliteMcpServerStore.ts
@@ -1,8 +1,3 @@
-import type { TokenPagination } from '@truefoundry/trueforge-core/agent-session';
-import {
- decodeOffsetPageToken,
- paginateOffsetRows,
-} from '@truefoundry/trueforge-core/agent-session/store/OffsetPageToken';
import type { ExpressionBuilder, Kysely, Transaction } from 'kysely';
import type { OAuthClientRecord } from '../../../mcp/auth/types';
import type { McpServerManifest } from '../../../schemas/mcpServer';
@@ -43,25 +38,16 @@ export class SqliteMcpServerStore implements IMcpServerStore<Transaction<Databas
this.#db = db;
}
- async listServers(
- input: ListMcpServersInput,
- transaction?: Transaction<Database>,
- ): Promise<{ data: McpServerRecord[]; pagination: TokenPagination }> {
- const offset = decodeOffsetPageToken(input.page_token);
+ async listServers(input: ListMcpServersInput, transaction?: Transaction<Database>): Promise<McpServerRecord[]> {
if (input.names?.length === 0) {
- return paginateOffsetRows([], input.limit, offset);
+ return [];
}
const db = transaction ?? this.#db;
let query = db.selectFrom('mcp_server').select(recordColumns).where('tenant_id', '=', input.tenant_id);
if (input.names !== undefined) {
query = query.where('name', 'in', [...input.names]);
}
- const rows = await query
- .orderBy('name')
- .limit(input.limit + 1)
- .offset(offset)
- .execute();
- return paginateOffsetRows(rows, input.limit, offset);
+ return await query.orderBy('name').execute();
}
async getServer(input: GetMcpServerInput, transaction?: Transaction<Database>): Promise<McpServerRecord | undefined> {
diff --git a/packages/trueforge/src/routes/mcpServerRoutes.ts b/packages/trueforge/src/routes/mcpServerRoutes.ts
index 5cd701842..534e4b5a3 100644
--- a/packages/trueforge/src/routes/mcpServerRoutes.ts
+++ b/packages/trueforge/src/routes/mcpServerRoutes.ts
@@ -1,5 +1,4 @@
import { createRoute, z } from '@hono/zod-openapi';
-import { MCP_SERVERS_PAGE_LIMIT, MCP_SERVERS_PAGE_LIMIT_MAX } from '../schemas/common';
import { RequestErrorResponseSchema } from '../schemas/errors';
import {
CreateMcpServerRequestSchema,
@@ -10,23 +9,8 @@ import {
McpAuthStatusSchema,
UpdateMcpServerRequestSchema,
} from '../schemas/mcpServer';
-import { TOKEN_PAGINATION } from './fernExtensions';
import { OpenApiTag } from './openapiTags';
-export const ListMcpServersQuerySchema = z
- .object({
- limit: z.coerce
- .number()
- .int()
- .min(1)
- .max(MCP_SERVERS_PAGE_LIMIT_MAX)
- .optional()
- .default(MCP_SERVERS_PAGE_LIMIT)
- .describe(`Page size. Defaults to ${String(MCP_SERVERS_PAGE_LIMIT)}, max ${String(MCP_SERVERS_PAGE_LIMIT_MAX)}.`),
- page_token: z.string().optional().describe('Opaque token from a previous response `next_page_token`.'),
- })
- .openapi('ListMCPServersQuery');
-
const McpServerNameParamsSchema = z.object({
name: z.string().min(1).describe('MCP server name.'),
});
@@ -37,21 +21,13 @@ export const listAvailableMcpServersRoute = createRoute({
path: '/',
tags: [OpenApiTag.MCP_SERVERS],
summary: 'List MCP servers for chat',
- description: 'Paginated MCP servers as a slim name/url list for the composer.',
+ description: 'Configured MCP servers as a slim name/url list for the composer.',
'x-fern-sdk-group-name': ['mcpServers'],
'x-fern-sdk-method-name': 'list',
- 'x-fern-pagination': TOKEN_PAGINATION,
- request: {
- query: ListMcpServersQuerySchema,
- },
responses: {
200: {
content: { 'application/json': { schema: ListAvailableMcpServersResponseSchema } },
- description: 'Paginated MCP servers (chat projection).',
- },
- 400: {
- content: { 'application/json': { schema: RequestErrorResponseSchema } },
- description: 'Invalid query parameters or page token.',
+ description: 'All configured MCP servers (chat projection).',
},
401: {
content: { 'application/json': { schema: RequestErrorResponseSchema } },
@@ -93,21 +69,13 @@ export const listMcpServersRoute = createRoute({
path: '/',
tags: [OpenApiTag.MCP_SERVERS],
summary: 'List MCP servers',
- description: 'Paginated MCP servers with auth_status. Header secrets are redacted.',
+ description: 'Configured MCP servers with auth_status. Header secrets are redacted.',
'x-fern-sdk-group-name': ['settings', 'mcpServers'],
'x-fern-sdk-method-name': 'list',
- 'x-fern-pagination': TOKEN_PAGINATION,
- request: {
- query: ListMcpServersQuerySchema,
- },
responses: {
200: {
content: { 'application/json': { schema: ListMcpServersResponseSchema } },
- description: 'Paginated MCP servers',
- },
- 400: {
- content: { 'application/json': { schema: RequestErrorResponseSchema } },
- description: 'Invalid query parameters or page token.',
+ description: 'All configured MCP servers',
},
401: {
content: { 'application/json': { schema: RequestErrorResponseSchema } },
diff --git a/packages/trueforge/src/runtime/sessionResources.ts b/packages/trueforge/src/runtime/sessionResources.ts
index 086210e4e..de5dcb218 100644
--- a/packages/trueforge/src/runtime/sessionResources.ts
+++ b/packages/trueforge/src/runtime/sessionResources.ts
@@ -280,10 +280,8 @@ export async function validateAgentSpec({
await mcpServerStore.listServers({
tenant_id,
names,
- limit: Math.max(names.length, 1),
- page_token: undefined,
})
- ).data.map(record => record.name),
+ ).map(record => record.name),
);
const unknown = requestedMcpServers.find(server => !configuredNames.has(server.name));
if (unknown !== undefined) {
diff --git a/packages/trueforge/src/schemas/common.ts b/packages/trueforge/src/schemas/common.ts
index 1772d9737..d96e14a65 100644
--- a/packages/trueforge/src/schemas/common.ts
+++ b/packages/trueforge/src/schemas/common.ts
@@ -22,10 +22,6 @@ export type ResourceName = z.infer<typeof NameSchema>;
export const PAGE_LIMIT = 25;
/** Session/turn event list page size (default = max). */
export const EVENTS_PAGE_LIMIT = 100;
-/** MCP server list default page size. */
-export const MCP_SERVERS_PAGE_LIMIT = 100;
-/** MCP server list max page size. */
-export const MCP_SERVERS_PAGE_LIMIT_MAX = 200;
/** Adds a validation issue if two entries share a name. */
export function uniqueNames(entries: { name: string }[], ctx: z.RefinementCtx): void {
diff --git a/packages/trueforge/src/schemas/mcpServer.ts b/packages/trueforge/src/schemas/mcpServer.ts
index 91fc62e95..5c2defb11 100644
--- a/packages/trueforge/src/schemas/mcpServer.ts
+++ b/packages/trueforge/src/schemas/mcpServer.ts
@@ -7,7 +7,6 @@
* Turn execution resolves DCR tokens via resolveMcpAuth.
*/
import { z } from '@hono/zod-openapi';
-import { TokenPaginationSchema } from '@truefoundry/trueforge-core/agent-session';
import type { OAuthToken } from '../mcp/auth/types';
import { NameSchema } from './common';
@@ -107,7 +106,6 @@ export const GetMcpServerResponseSchema = z.object({ data: ConfiguredMcpServerSc
export const ListMcpServersResponseSchema = z
.object({
data: z.array(ConfiguredMcpServerSchema),
- pagination: TokenPaginationSchema,
})
.openapi('ListMCPServersResponse');
@@ -134,7 +132,6 @@ export const AvailableMcpServerSchema = z
export const ListAvailableMcpServersResponseSchema = z
.object({
data: z.array(AvailableMcpServerSchema),
- pagination: TokenPaginationSchema,
})
.openapi('ListAvailableMCPServersResponse');
diff --git a/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts b/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts
index 7298118e0..8e120b08a 100644
--- a/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts
+++ b/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts
@@ -1,8 +1,3 @@
-import type { TokenPagination } from '@truefoundry/trueforge-core/agent-session';
-import {
- decodeOffsetPageToken,
- paginateOffsetRows,
-} from '@truefoundry/trueforge-core/agent-session/store/OffsetPageToken';
import { McpConnectionError, type RemoteMcpHeaders } from '@truefoundry/trueforge-core/core';
import { HTTPException } from 'hono/http-exception';
import type { Logger } from 'winston';
@@ -124,30 +119,21 @@ export class TrueFoundryMcpServerStore<TTransaction = never> implements IMcpServ
return async () => ({ headers: await headers() });
}
- async listServers(
- input: ListMcpServersInput,
- transaction?: TTransaction,
- ): Promise<{ data: McpServerRecord[]; pagination: TokenPagination }> {
+ async listServers(input: ListMcpServersInput, transaction?: TTransaction): Promise<McpServerRecord[]> {
void transaction;
- const offset = decodeOffsetPageToken(input.page_token);
if (input.names?.length === 0) {
- return paginateOffsetRows([], input.limit, offset);
+ return [];
}
const accessToken = await this.#resolveAccessToken();
const [rows, gatewayUrl] = await Promise.all([
this.#client.listMcpServers({
accessToken,
- limit: input.limit + 1,
- offset,
...(input.names !== undefined ? { names: input.names } : {}),
}),
this.#resolveGatewayUrl(),
]);
- const records = mapSfyMcpServers({ rows }).map(server =>
- toRecord({ tenant_id: input.tenant_id, server, gatewayUrl }),
- );
- return paginateOffsetRows(records, input.limit, offset);
+ return mapSfyMcpServers({ rows }).map(server => toRecord({ tenant_id: input.tenant_id, server, gatewayUrl }));
}
async getServer(input: GetMcpServerInput, transaction?: TTransaction): Promise<McpServerRecord | undefined> {
diff --git a/packages/trueforge/src/truefoundry/TrueFoundryServiceFoundryServerClient.ts b/packages/trueforge/src/truefoundry/TrueFoundryServiceFoundryServerClient.ts
index f82e2f1a0..73bfb7350 100644
--- a/packages/trueforge/src/truefoundry/TrueFoundryServiceFoundryServerClient.ts
+++ b/packages/trueforge/src/truefoundry/TrueFoundryServiceFoundryServerClient.ts
@@ -172,25 +172,16 @@ export class TrueFoundryServiceFoundryServerClient {
});
}
- /** One page of MCP servers; optional `names` filters with `name IN (…)`. */
- async listMcpServers(input: {
- accessToken: string;
- limit: number;
- offset: number;
- names?: readonly string[];
- }): Promise<unknown[]> {
- const query: Record<string, string> = {
- offset: String(input.offset),
- limit: String(input.limit),
- ...(input.names !== undefined
- ? {
+ async listMcpServers(input: { accessToken: string; names?: readonly string[] }): Promise<unknown[]> {
+ const query: Record<string, string> =
+ input.names === undefined
+ ? {}
+ : {
filter: JSON.stringify({
op: 'and',
values: [{ field: 'name', op: 'IN', values: [...input.names] }],
}),
- }
- : {}),
- };
+ };
const payload = await this.#requestJson({
url: this.#url(MCP_SERVERS_PATH, query),
accessToken: input.accessToken,
diff --git a/packages/trueforge/tests/db/mcpServerStoreContractSuite.ts b/packages/trueforge/tests/db/mcpServerStoreContractSuite.ts
index 9435903eb..3486b57d4 100644
--- a/packages/trueforge/tests/db/mcpServerStoreContractSuite.ts
+++ b/packages/trueforge/tests/db/mcpServerStoreContractSuite.ts
@@ -98,11 +98,8 @@ export function runMcpServerStoreContractSuite(getStore: () => IMcpServerStore):
const servers = await store.listServers({
tenant_id: TENANT,
names: undefined,
- limit: 25,
- page_token: undefined,
});
- expect(servers.data).toEqual([updated]);
- expect(servers.pagination).toEqual({ limit: 25 });
+ expect(servers).toEqual([updated]);
});
it('listServers returns only the tenant, ordered by name', async () => {
@@ -118,11 +115,9 @@ export function runMcpServerStoreContractSuite(getStore: () => IMcpServerStore):
const servers = await store.listServers({
tenant_id: TENANT,
names: undefined,
- limit: 25,
- page_token: undefined,
});
- expect(servers.data.map(server => server.name)).toEqual(['deepwiki', 'linear']);
- expect(servers.data.every(server => server.tenant_id === TENANT)).toBe(true);
+ expect(servers.map(server => server.name)).toEqual(['deepwiki', 'linear']);
+ expect(servers.every(server => server.tenant_id === TENANT)).toBe(true);
});
it('listServers filters by names and returns empty for an empty name list', async () => {
@@ -142,53 +137,10 @@ export function runMcpServerStoreContractSuite(getStore: () => IMcpServerStore):
const filtered = await store.listServers({
tenant_id: TENANT,
names: ['notion', 'missing', 'deepwiki'],
- limit: 25,
- page_token: undefined,
});
- expect(filtered.data.map(server => server.name)).toEqual(['deepwiki', 'notion']);
+ expect(filtered.map(server => server.name)).toEqual(['deepwiki', 'notion']);
- await expect(
- store.listServers({ tenant_id: TENANT, names: [], limit: 25, page_token: undefined }),
- ).resolves.toEqual({ data: [], pagination: { limit: 25 } });
- });
-
- it('listServers paginates with limit and page_token', async () => {
- const store = getStore();
- await store.upsertServer({
- tenant_id: TENANT,
- name: 'alpha',
- manifest: manifest({ name: 'alpha', url: 'https://mcp.alpha.example/mcp' }),
- });
- await store.upsertServer({
- tenant_id: TENANT,
- name: 'bravo',
- manifest: manifest({ name: 'bravo', url: 'https://mcp.bravo.example/mcp' }),
- });
- await store.upsertServer({
- tenant_id: TENANT,
- name: 'charlie',
- manifest: manifest({ name: 'charlie', url: 'https://mcp.charlie.example/mcp' }),
- });
-
- const first = await store.listServers({
- tenant_id: TENANT,
- names: undefined,
- limit: 2,
- page_token: undefined,
- });
- expect(first.data.map(server => server.name)).toEqual(['alpha', 'bravo']);
- expect(first.pagination.limit).toBe(2);
- expect(first.pagination.next_page_token).toBeDefined();
-
- const second = await store.listServers({
- tenant_id: TENANT,
- names: undefined,
- limit: 2,
- page_token: first.pagination.next_page_token,
- });
- expect(second.data.map(server => server.name)).toEqual(['charlie']);
- expect(second.pagination.next_page_token).toBeUndefined();
- expect(second.pagination.previous_page_token).toBeDefined();
+ await expect(store.listServers({ tenant_id: TENANT, names: [] })).resolves.toEqual([]);
});
it('upsert leaves oauth columns null and does not clear a saved OAuth client', async () => {
const store = getStore();
diff --git a/packages/trueforge/tests/unit/apis/mcpServers.test.ts b/packages/trueforge/tests/unit/apis/mcpServers.test.ts
index 19ed21755..06e61a03e 100644
--- a/packages/trueforge/tests/unit/apis/mcpServers.test.ts
+++ b/packages/trueforge/tests/unit/apis/mcpServers.test.ts
@@ -179,65 +179,9 @@ describe('mcp-servers routers', () => {
expect(list.status).toBe(200);
expect(await list.json()).toEqual({
data: [configured(putBody, 'not_required')],
- pagination: { limit: 100 },
});
});
- it('GET / settings and chat list honor limit and page_token', async () => {
- await mcpServerStore.upsertServer({
- tenant_id: STANDALONE_REQUEST_CONTEXT.tenant_id,
- name: 'page-alpha',
- manifest: {
- type: 'remote',
- name: 'page-alpha',
- url: 'https://mcp.alpha.example/mcp',
- description: 'Page alpha.',
- },
- });
- await mcpServerStore.upsertServer({
- tenant_id: STANDALONE_REQUEST_CONTEXT.tenant_id,
- name: 'page-bravo',
- manifest: {
- type: 'remote',
- name: 'page-bravo',
- url: 'https://mcp.bravo.example/mcp',
- description: 'Page bravo.',
- },
- });
-
- const first = await settingsRouter.request('/?limit=1');
- expect(first.status).toBe(200);
- const firstBody = (await first.json()) as {
- data: { name: string }[];
- pagination: { limit: number; next_page_token?: string };
- };
- expect(firstBody.data).toHaveLength(1);
- expect(firstBody.pagination.limit).toBe(1);
- expect(firstBody.pagination.next_page_token).toBeDefined();
-
- const second = await settingsRouter.request(
- `/?limit=1&page_token=${encodeURIComponent(firstBody.pagination.next_page_token ?? '')}`,
- );
- expect(second.status).toBe(200);
- const secondBody = (await second.json()) as {
- data: { name: string }[];
- pagination: { limit: number; previous_page_token?: string };
- };
- expect(secondBody.data).toHaveLength(1);
- expect(secondBody.data[0]?.name).not.toBe(firstBody.data[0]?.name);
- expect(secondBody.pagination.previous_page_token).toBeDefined();
-
- const chatFirst = await mcpServersRouter.request('/?limit=1');
- expect(chatFirst.status).toBe(200);
- const chatBody = (await chatFirst.json()) as {
- data: unknown[];
- pagination: { limit: number; next_page_token?: string };
- };
- expect(chatBody.data).toHaveLength(1);
- expect(chatBody.pagination.limit).toBe(1);
- expect(chatBody.pagination.next_page_token).toBeDefined();
- });
-
it('POST creates a server and returns 409 on name clash', async () => {
const createBody = {
type: 'remote' as const,
diff --git a/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts b/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts
index 240fa684a..6f985371c 100644
--- a/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts
+++ b/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts
@@ -91,47 +91,21 @@ describe('resolveAuthorizeRedirectURL', () => {
describe('TrueFoundryMcpServerStore', () => {
describe('listServers', () => {
- it('forwards one SFY page with limit+1 and paginates', async () => {
- const { store, client } = createStore();
- const second = { ...SFY_ROW, id: 'mcp-id-2', name: 'linear' };
- client.listMcpServers.mockResolvedValue([SFY_ROW, second]);
-
- const page = await store.listServers({
- tenant_id: TENANT,
- names: undefined,
- limit: 1,
- page_token: undefined,
- });
-
- expect(client.listMcpServers).toHaveBeenCalledWith({
- accessToken: ACCESS_TOKEN,
- limit: 2,
- offset: 0,
- });
- expect(page.data.map(server => server.name)).toEqual(['github']);
- expect(page.pagination.next_page_token).toBeDefined();
- expect(client.listGatewayInstallations).toHaveBeenCalledTimes(1);
- });
-
it('filters names with one SFY list call (name IN)', async () => {
const { store, client } = createStore();
client.listMcpServers.mockResolvedValue([SFY_ROW]);
- const page = await store.listServers({
+ const records = await store.listServers({
tenant_id: TENANT,
names: ['github', 'missing'],
- limit: 10,
- page_token: undefined,
});
expect(client.listMcpServers).toHaveBeenCalledWith({
accessToken: ACCESS_TOKEN,
- limit: 11,
- offset: 0,
names: ['github', 'missing'],
});
expect(client.getMcpServerByName).not.toHaveBeenCalled();
- expect(page.data.map(server => server.name)).toEqual(['github']);
+ expect(records.map(server => server.name)).toEqual(['github']);
});
});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4db699d6f..2f7a34e12 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -69,8 +69,8 @@ importers:
specifier: 0.2.21
'@truefoundry/assistant-ui-runtime':
- specifier: 0.1.31
+ specifier: 0.1.33
'@truefoundry/trueforge-sdk':
specifier: workspace:*
version: link:../trueforge-sdk
@@ -363,8 +363,8 @@ importers:
specifier: ^0.13.2
'@truefoundry/assistant-ui-runtime':
- specifier: 0.1.31
+ specifier: 0.1.33
'@truefoundry/trueforge-sdk':
specifier: workspace:*
version: link:../trueforge-sdk
@@ -3642,8 +3642,8 @@ packages:
'@types/react-dom':
optional: true
- '@truefoundry/[email protected]':
- resolution: {integrity: sha512-siWHjK0Ddargk6zjN3NlD7j+E8xOHGQFN+mFeyncY8L5pibxK4bNQi8Pd4qtNYFxxwkb8f1QUoMeB4bZMk+Jbw==}
+ '@truefoundry/[email protected]':
+ resolution: {integrity: sha512-HMHB9UDy6NmIwVMLTSSTzkGCN1cP4PSDP5T6IU9kwVWT2+MEZxpyX8/GFgX7jvHbCPTIXU9DmveTF+pQJb9Ccw==}
peerDependencies:
'@types/react': '*'
react: ^18 || ^19
@@ -10897,7 +10897,7 @@ snapshots:
'@types/react': 19.2.18
'@types/react-dom': 19.2.5(@types/[email protected])
dependencies:
'@assistant-ui/store': 0.2.21(@assistant-ui/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 8776f86db..b08354327 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -17,7 +17,7 @@ allowBuilds:
# Silence peer mismatches between trueforge-ui peers and the versions we pin.
peerDependencyRules:
allowedVersions:
- '@truefoundry/assistant-ui-runtime': '0.1.26'
+ '@truefoundry/assistant-ui-runtime': '0.1.33'
# One Context module for assistant-ui (avoids "requires an AuiProvider").
overrides: