Skip to content

Prefer nested request metadata #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
leehack wants to merge 1 commit into from
Closed

Prefer nested request metadata #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 3 additions & 10 deletions lib/src/types/json_rpc.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,12 +328,12 @@ Map<String, dynamic>? _parseRequestMeta(Object? value) {
return validateRequestMeta(readJsonObject(value, '_meta'));
}

/// Extracts request metadata from either top-level or params-nested `_meta`.
/// Extracts request metadata, preferring spec-defined params-nested `_meta`.
Map<String, dynamic>? extractRequestMeta(Map<String, dynamic> json) {
final topLevelMeta = _parseRequestMeta(json['_meta']);
final params = json['params'];
final paramsMeta = params is Map ? _parseRequestMeta(params['_meta']) : null;
return topLevelMeta ?? paramsMeta;
return paramsMeta ?? topLevelMeta;
}

/// Base class for all JSON-RPC messages (requests, notifications, responses, errors).
Expand Down Expand Up @@ -435,14 +435,7 @@ sealed class JsonRpcMessage {
_ => JsonRpcNotification(
method: method,
params: params,
meta: readOptionalJsonObject(
json['_meta'],
'JsonRpcNotification._meta',
) ??
readOptionalJsonObject(
params?['_meta'],
'JsonRpcNotification._meta',
),
meta: extractRequestMeta(json),
),
};
}
Expand Down
20 changes: 20 additions & 0 deletions test/mcp_2025_11_25_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,6 +1226,26 @@ void main() {
);
});

test('request parsing prefers params metadata over top-level metadata',
() {
final parsed = JsonRpcMessage.fromJson(
const {
'jsonrpc': jsonRpcVersion,
'id': 'tools',
'method': Method.toolsList,
'_meta': {'progressToken': 'top-level'},
'params': {
'_meta': {'progressToken': 'params-nested'},
},
},
);

expect(parsed, isA<JsonRpcListToolsRequest>());
final request = parsed as JsonRpcListToolsRequest;
expect(request.meta, {'progressToken': 'params-nested'});
expect(request.progressToken, 'params-nested');
});

test('server capabilities omit non-stable fields while parsing legacy',
() {
final capabilities = const ServerCapabilities(
Expand Down
25 changes: 25 additions & 0 deletions test/mcp_2026_07_28_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,31 @@ void main() {
}
});

test('request parsing does not let top-level metadata override params', () {
final parsed = JsonRpcMessage.fromJson({
'jsonrpc': jsonRpcVersion,
'id': 'tools',
'method': Method.toolsList,
'_meta': {
McpMetaKey.protocolVersion: latestProtocolVersion,
},
'params': {
'_meta': _clientMeta(),
},
});

expect(parsed, isA<JsonRpcListToolsRequest>());
final request = parsed as JsonRpcListToolsRequest;
expect(
request.meta?[McpMetaKey.protocolVersion],
draftProtocolVersion2026_07_28,
);
expect(request.meta?[McpMetaKey.clientInfo], {
'name': 'client',
'version': '1.0.0',
});
});

test('preserves integer request ids and progress tokens', () {
final message = JsonRpcMessage.fromJson(
const {
Expand Down