Merge main into v2-2026-07-28#2300
Merged
Merged
Conversation
…2268) Co-authored-by: Felix Weinberger <3823880+felixweinberger@users.noreply.github.com>
…rs, pagination docs, path-sanitization note) (#2269) Co-authored-by: Felix Weinberger <3823880+felixweinberger@users.noreply.github.com>
…EP-414) (#2270) Co-authored-by: Felix Weinberger <3823880+felixweinberger@users.noreply.github.com>
Brings in four upstream changes: - SEP-414 reserved trace context _meta keys (traceparent/tracestate/baggage) and propagation docs (#2270) - SEP-2577 deprecation of the roots, sampling, and logging runtime APIs (#2268) - Non-SEP draft-spec conformance fixes: eager list handlers, pagination docs, path-sanitization note (#2269) - Cloudflare workers test leak fix (#2296) Notable resolutions: - Trace context _meta keys are propagation keys: they are NOT added to the reserved envelope-key set lifted out of inbound _meta in protocol.ts, so they pass through to handlers untouched (covered by the new traceContextMeta tests, taken unmodified). - SEP-2577 deprecation docs reconciled onto this branch's typed request methods (Client.setLoggingLevel, Server.listRoots) without changing their implementations.
🦋 Changeset detectedLatest commit: 2685bec The changes in this PR will be included in the next version bump. This PR includes changesets to release 3 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
@modelcontextprotocol/client
@modelcontextprotocol/codemod
@modelcontextprotocol/server
@modelcontextprotocol/server-legacy
@modelcontextprotocol/express
@modelcontextprotocol/fastify
@modelcontextprotocol/hono
@modelcontextprotocol/node
commit: |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Routine sync of
maininto thev2-2026-07-28integration branch, bringing in the four changesthat landed on
mainsince the last sync (merge-base f2a3320):_metakeys (traceparent,tracestate,baggage) andpropagation docs (feat(core): reserved trace context _meta keys and propagation docs (SEP-414) #2270)
doc updates, path-sanitization note (fix(server,client): non-SEP draft spec conformance (eager list handlers, pagination docs, path-sanitization note) #2269)
Conflict resolutions
packages/client/src/client/client.ts(setLoggingLevel) andpackages/server/src/server/server.ts(listRoots):mainadded SEP-2577@deprecateddocstrings on the old schema-based request implementations; this branch had already moved those
methods to the typed
request()form. Resolved by keeping the branch's implementations andcarrying over the upstream docstrings verbatim — deprecation scope is unchanged.
_metakeys are propagation keys, not envelope keys. They are intentionallynot added to the reserved envelope-key set that the protocol layer lifts out of inbound
_metaon this branch, so they continue to reach handlers untouched. Upstream'straceContextMeta.test.tsis taken unmodified and passes against the branch's lift.cloudflareWorkers tests) merged cleanly with upstream content intact.
Validation
pnpm build:all,pnpm -r typecheck,pnpm lint:all— passmiddleware + examples) including the new SEP-414 trace-context tests unmodified
cloudflareWorkers.test.ts, which now passes locally thanksto test(integration): fix cloudflare workers test leaking workerd processes #2296 dropping the per-run
npm installpin: baseline check passed, no new failures
pnpm-lock.yamlunchanged (no dependency changes on either side)