Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/standard-schema-empty-issues.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@modelcontextprotocol/client': patch
'@modelcontextprotocol/server': patch
---

Treat Standard Schema validation results with an empty `issues` array as failures instead of accepting an undefined value.
7 changes: 5 additions & 2 deletions packages/core-internal/src/util/standardSchema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,11 @@ export async function validateStandardSchema<T extends StandardSchemaV1>(
data: unknown
): Promise<StandardSchemaValidationResult<StandardSchemaV1.InferOutput<T>>> {
const result = await schema['~standard'].validate(data);
if (result.issues && result.issues.length > 0) {
return { success: false, error: result.issues.map(i => formatIssue(i)).join(', ') };
if (result.issues) {
Comment thread
rwzdk marked this conversation as resolved.
// A present but empty `issues` array is still a failure, so fall back to a
// non-empty message: callers that surface `error` must not report it as success.
const message = result.issues.map(i => formatIssue(i)).join(', ');
return { success: false, error: message || 'validation failed' };
}
return { success: true, data: (result as StandardSchemaV1.SuccessResult<unknown>).value as StandardSchemaV1.InferOutput<T> };
}
Expand Down
29 changes: 28 additions & 1 deletion packages/core-internal/test/util/standardSchema.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
import * as z from 'zod/v4';

import { standardSchemaToJsonSchema } from '../../src/util/standardSchema';
import { type StandardSchemaV1, standardSchemaToJsonSchema, validateStandardSchema } from '../../src/util/standardSchema';

describe('validateStandardSchema', () => {
test.each(['synchronous', 'asynchronous'] as const)('rejects %s failures with an empty issues array', async mode => {
const schema: StandardSchemaV1 = {
'~standard': {
version: 1,
vendor: 'empty-issues',
validate: () => (mode === 'asynchronous' ? Promise.resolve({ issues: [] }) : { issues: [] })
}
};

await expect(validateStandardSchema(schema, { name: 'example' })).resolves.toEqual({
success: false,
error: 'validation failed'
});
});

test('preserves transformed values when validation succeeds', async () => {
const schema = z.string().transform(value => value.toUpperCase());

await expect(validateStandardSchema(schema, 'hello')).resolves.toEqual({ success: true, data: 'HELLO' });
});

test('preserves undefined when validation succeeds', async () => {
await expect(validateStandardSchema(z.undefined(), undefined)).resolves.toEqual({ success: true, data: undefined });
});
});

describe('standardSchemaToJsonSchema', () => {
test('emits type:object for plain z.object schemas', () => {
Expand Down
Loading