Skip to content

LLM inference in C/C++

C++ ggml

ui: read structuredContent from MCP tool result when content is empty (#26691)

Gautam05070d9ceae1e382
diff --git a/tools/ui/src/lib/services/mcp.service.ts b/tools/ui/src/lib/services/mcp.service.ts
index 43f905c33a..65e9e59d6e 100644
--- a/tools/ui/src/lib/services/mcp.service.ts
+++ b/tools/ui/src/lib/services/mcp.service.ts
@@ -18,7 +18,8 @@ import {
DEFAULT_CLIENT_VERSION,
DEFAULT_IMAGE_MIME_TYPE,
DEFAULT_MCP_CONFIG,
- HEADERS
+ HEADERS,
+ NEWLINE
} from '$lib/constants';
import {
MCPConnectionPhase,
@@ -70,6 +71,7 @@ interface ToolResultContentItem {
interface ToolCallResult {
content?: ToolResultContentItem[];
+ structuredContent?: Record<string, unknown>;
isError?: boolean;
_meta?: Record<string, unknown>;
}
@@ -1012,10 +1014,20 @@ export class MCPService {
if (!Array.isArray(content)) return '';
- return content
+ const formatted = content
.map((item) => this.formatSingleContent(item))
.filter(Boolean)
- .join('\n');
+ .join(NEWLINE);
+
+ if (formatted !== '') {
+ return formatted;
+ }
+
+ if (result.structuredContent && typeof result.structuredContent === 'object') {
+ return JSON.stringify(result.structuredContent);
+ }
+
+ return '';
}
private static formatSingleContent(content: ToolResultContentItem): string {
diff --git a/tools/ui/tests/unit/mcp-service.test.ts b/tools/ui/tests/unit/mcp-service.test.ts
index 358881b470..97879f234c 100644
--- a/tools/ui/tests/unit/mcp-service.test.ts
+++ b/tools/ui/tests/unit/mcp-service.test.ts
@@ -2,7 +2,7 @@ import { Client } from '@modelcontextprotocol/sdk/client';
import { CORS_PROXY } from '$lib/constants';
import { MCPConnectionPhase, MCPTransportType } from '$lib/enums';
import { MCPService } from '$lib/services/mcp.service';
-import type { MCPConnectionLog, MCPServerConfig } from '$lib/types';
+import type { MCPConnection, MCPConnectionLog, MCPServerConfig } from '$lib/types';
import { afterEach, describe, expect, it, vi } from 'vitest';
type DiagnosticFetchFactory = (
@@ -329,4 +329,21 @@ describe('MCPService', () => {
)
).toHaveLength(0);
});
+
+ it('falls back to structuredContent when content array is empty', async () => {
+ const connection = {
+ client: {
+ callTool: vi.fn().mockResolvedValue({
+ content: [],
+ structuredContent: { accounts: [{ id: 1 }], total: 1 }
+ })
+ },
+ requestTimeoutMs: 9000,
+ serverName: 'test-server'
+ } as unknown as MCPConnection;
+ const result = await MCPService.callTool(connection, { arguments: {}, name: 'tool' });
+
+ expect(result.isError).toBe(false);
+ expect(result.content).toBe('{"accounts":[{"id":1}],"total":1}');
+ });
});