mcp: update JSON marshaling to not HTML-escape messages #769
+17
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's causing some servers to fail: #767
maciej-kisiel
force-pushed
the
mkisiel/json-escaping
branch
from
7787ac1 to
4030f6f
Compare
Contributor
|
We should provide a way to preserve the old behavior. We don't know who depends on it. |
jba
requested changes
Jan 29, 2026
| func EncodeIndent(msg Message, prefix, indent string) ([]byte, error) { | ||
| wire := wireCombined{VersionTag: wireVersion} | ||
| msg.marshal(&wire) | ||
| // TODO: do we need to escape HTML here? |
Contributor
There was a problem hiding this comment.
It's only used in tests, but why should tests behave differently? So you should turn off escaping here too.
| return nil, nil | ||
| } | ||
| data, err := json.Marshal(obj) | ||
| data, err := jsonMarshal(obj) |
Contributor
There was a problem hiding this comment.
If you grep the codebase, there are many other calls to json.Marshal. Should they all go to jsonMarshal? I'm not sure.
Contributor
There was a problem hiding this comment.
If this is specifically about messages, this is probably the only location that needs to change.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It's causing some servers to fail: #767. I checked with Typescript implementation and it doesn't do any escaping.
It's still a behavior change.