test(compat): add e2e raw-shape tools/call test; drop vestigial warn-spy; cover normalizeRawShapeSchema passthrough/undefined

Author: felixweinberger

packages/core/test/util/standardSchema.test.ts

@@ -24,6 +24,13 @@ describe('normalizeRawShapeSchema', () => {
         expect(wrapped).toBeDefined();
         expect(standardSchemaToJsonSchema(wrapped!, 'input').type).toBe('object');
     });
+    test('passes through an already-wrapped Standard Schema unchanged', () => {
+        const schema = z.object({ a: z.string() });
+        expect(normalizeRawShapeSchema(schema)).toBe(schema);
+    });
+    test('returns undefined for undefined input', () => {
+        expect(normalizeRawShapeSchema(undefined)).toBeUndefined();
+    });
 });
 
 describe('standardSchemaToJsonSchema', () => {

packages/server/test/server/mcp.compat.test.ts

@@ -1,11 +1,11 @@
-import { isStandardSchema } from '@modelcontextprotocol/core';
+import type { JSONRPCMessage } from '@modelcontextprotocol/core';
+import { InMemoryTransport, isStandardSchema, LATEST_PROTOCOL_VERSION } from '@modelcontextprotocol/core';
 import { describe, expect, it, vi } from 'vitest';
 import * as z from 'zod/v4';
 import { McpServer } from '../../src/index.js';
 
 describe('registerTool/registerPrompt accept raw Zod shape (auto-wrapped)', () => {
-    it('registerTool accepts a raw shape for inputSchema, auto-wraps, and does not warn', () => {
-        const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    it('registerTool accepts a raw shape for inputSchema and auto-wraps it', () => {
         const server = new McpServer({ name: 't', version: '1.0.0' });
 
         server.registerTool('a', { inputSchema: { x: z.number() } }, async ({ x }) => ({
@@ -19,9 +19,6 @@ describe('registerTool/registerPrompt accept raw Zod shape (auto-wrapped)', () =
         expect(Object.keys(tools)).toEqual(['a', 'b']);
         // raw shape was wrapped into a Standard Schema (z.object)
         expect(isStandardSchema(tools['a']?.inputSchema)).toBe(true);
-
-        expect(warn).not.toHaveBeenCalled();
-        warn.mockRestore();
     });
 
     it('registerTool accepts a raw shape for outputSchema and auto-wraps it', () => {
@@ -36,20 +33,18 @@ describe('registerTool/registerPrompt accept raw Zod shape (auto-wrapped)', () =
         expect(isStandardSchema(tools['out']?.outputSchema)).toBe(true);
     });
 
-    it('registerTool with z.object() inputSchema also works without warning', () => {
-        const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    it('registerTool with z.object() inputSchema also works (passthrough, no auto-wrap)', () => {
         const server = new McpServer({ name: 't', version: '1.0.0' });
 
         server.registerTool('c', { inputSchema: z.object({ x: z.number() }) }, async ({ x }) => ({
             content: [{ type: 'text' as const, text: String(x) }]
         }));
 
-        expect(warn).not.toHaveBeenCalled();
-        warn.mockRestore();
+        const tools = (server as unknown as { _registeredTools: Record<string, { inputSchema?: unknown }> })._registeredTools;
+        expect(isStandardSchema(tools['c']?.inputSchema)).toBe(true);
     });
 
-    it('registerPrompt accepts a raw shape for argsSchema and does not warn', () => {
-        const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    it('registerPrompt accepts a raw shape for argsSchema', () => {
         const server = new McpServer({ name: 't', version: '1.0.0' });
 
         server.registerPrompt('p', { argsSchema: { topic: z.string() } }, async ({ topic }) => ({
@@ -59,8 +54,48 @@ describe('registerTool/registerPrompt accept raw Zod shape (auto-wrapped)', () =
         const prompts = (server as unknown as { _registeredPrompts: Record<string, { argsSchema?: unknown }> })._registeredPrompts;
         expect(Object.keys(prompts)).toContain('p');
         expect(isStandardSchema(prompts['p']?.argsSchema)).toBe(true);
+    });
+
+    it('callback receives validated, typed args end-to-end via tools/call', async () => {
+        const server = new McpServer({ name: 't', version: '1.0.0' });
+
+        let received: { x: number } | undefined;
+        server.registerTool('echo', { inputSchema: { x: z.number() } }, async args => {
+            received = args;
+            return { content: [{ type: 'text' as const, text: String(args.x) }] };
+        });
+
+        const [client, srv] = InMemoryTransport.createLinkedPair();
+        await server.connect(srv);
+        await client.start();
+
+        const responses: JSONRPCMessage[] = [];
+        client.onmessage = m => responses.push(m);
+
+        await client.send({
+            jsonrpc: '2.0',
+            id: 1,
+            method: 'initialize',
+            params: {
+                protocolVersion: LATEST_PROTOCOL_VERSION,
+                capabilities: {},
+                clientInfo: { name: 'c', version: '1.0.0' }
+            }
+        } as JSONRPCMessage);
+        await client.send({ jsonrpc: '2.0', method: 'notifications/initialized' } as JSONRPCMessage);
+        await client.send({
+            jsonrpc: '2.0',
+            id: 2,
+            method: 'tools/call',
+            params: { name: 'echo', arguments: { x: 7 } }
+        } as JSONRPCMessage);
+
+        await vi.waitFor(() => expect(responses.some(r => 'id' in r && r.id === 2)).toBe(true));
+
+        expect(received).toEqual({ x: 7 });
+        const result = responses.find(r => 'id' in r && r.id === 2) as { result?: { content: Array<{ text: string }> } };
+        expect(result.result?.content[0]?.text).toBe('7');
 
-        expect(warn).not.toHaveBeenCalled();
-        warn.mockRestore();
+        await server.close();
     });
 });