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
18 changes: 18 additions & 0 deletions src/validation/wire-schema.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,24 @@ describe('wireSchemaErrors', () => {
).toEqual([]);
});

it('accepts extension result types through the generic result envelope', () => {
expect(
wireSchemaErrors(
DRAFT_PROTOCOL_VERSION,
{
jsonrpc: '2.0',
id: 3,
result: {
resultType: 'task',
taskId: 'task-1',
status: 'working'
}
},
'tools/call'
)
).toEqual([]);
});

it('accepts a JSON-RPC batch under 2025-03-26 and reports per-element errors', () => {
expect(
wireSchemaErrors('2025-03-26', [
Expand Down
24 changes: 16 additions & 8 deletions src/validation/wire-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -261,15 +261,23 @@ export function wireSchemaErrors(

if (msg.result !== undefined) {
// SEP-2322 (MRTR): any request may be answered with an InputRequiredResult
// instead of its method's result type; discriminate on resultType.
// instead of its method's result type; discriminate on resultType. Results
// introduced by extensions use the same open discriminator and are checked
// against the generic result envelope until their schema is available here.
const resultType = (msg.result as Record<string, unknown> | null)
?.resultType;
const inputRequired =
(msg.result as Record<string, unknown> | null)?.resultType ===
'input_required' && 'InputRequiredResult' in spec.defs;
const resultDefName = inputRequired
? 'InputRequiredResult'
: requestMethod !== undefined
? spec.resultDefs.get(requestMethod)
: undefined;
resultType === 'input_required' && 'InputRequiredResult' in spec.defs;
const extensionResult =
typeof resultType === 'string' &&
resultType !== 'complete' &&
resultType !== 'input_required';
let resultDefName: string | undefined;
if (inputRequired) {
resultDefName = 'InputRequiredResult';
} else if (!extensionResult && requestMethod !== undefined) {
resultDefName = spec.resultDefs.get(requestMethod);
}
if (resultDefName) {
const typed = validateAgainst(resultDefName, msg.result).map(
(e) => `${e} (result of '${requestMethod}')`
Expand Down