Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(mcp): offload tool results by UTF-8 bytes

Yudhi Armyndharisbada149990dc
diff --git a/src/modules/mcp/tool-result.spec.ts b/src/modules/mcp/tool-result.spec.ts
index f652c2f38..6d71d88c7 100644
--- a/src/modules/mcp/tool-result.spec.ts
+++ b/src/modules/mcp/tool-result.spec.ts
@@ -18,6 +18,25 @@ describe('smartToolResult', () => {
expect(result.content).toEqual([{ type: 'text', text: 'null' }]);
});
+ // The threshold is 4 KB of UTF-8, not 4096 UTF-16 code units: multi-byte text must not inline at triple size.
+ it.each(['x'.repeat(4096), '\u00e9'.repeat(2048), '\ud83d\ude00'.repeat(1024)])(
+ 'inlines a payload of exactly 4096 UTF-8 bytes',
+ text => {
+ expect(smartToolResult(text).content).toEqual([{ type: 'text', text }]);
+ },
+ );
+
+ it.each(['x'.repeat(4097), '\u00e9'.repeat(2048) + 'x', '\u4e2d'.repeat(2000), '\ud83d\ude00'.repeat(1025)])(
+ 'embeds a payload over 4096 UTF-8 bytes without changing its contents',
+ text => {
+ const { content } = smartToolResult(text);
+ expect(content).toHaveLength(2);
+ const resource = content[1];
+ if (resource.type !== 'resource' || !('blob' in resource.resource)) throw new Error('expected a blob resource');
+ expect(Buffer.from(resource.resource.blob, 'base64').toString('utf8')).toBe(text);
+ },
+ );
+
it('offloads a payload over 4 KB to an embedded resource', () => {
const big = { blob: 'x'.repeat(5000) };
const result = smartToolResult(big);
diff --git a/src/modules/mcp/tool-result.ts b/src/modules/mcp/tool-result.ts
index 2575b7db1..e4b3d4be8 100644
--- a/src/modules/mcp/tool-result.ts
+++ b/src/modules/mcp/tool-result.ts
@@ -15,9 +15,9 @@ export function smartToolResult(data: string | object | object[]): CallToolResul
const text = typeof data === 'string' ? data : (JSON.stringify(data) ?? 'null');
const mimeType = typeof data === 'string' ? 'text/plain' : 'application/json';
const ext = typeof data === 'string' ? 'txt' : 'json';
- if (text.length > 4096) {
+ const buffer = Buffer.from(text);
+ if (buffer.byteLength > 4096) {
const uri = `mcp://toolResult/${randomUUID()}.${ext}`;
- const buffer = Buffer.from(text);
return {
content: [
{ type: 'text', text: `Received resource ${uri} with ${buffer.byteLength} bytes` },