[mgyarmathy]

This PR addresses several limitations of the current UriTemplate#match implementation:

• template matching fails when optional query parameters are not provided
• template matching fails when query parameters are provided out of order from the sequence specified in the template
• template matching does not decode uri-encoded query parameters

Omitted query parameters are parsed as an empty string per guidance of RFC 6570 Section 2.3.

Motivation and Context

Fixes #1079
Fixes #149

How Has This Been Tested?

New test additions cover all of the cases mentioned in #1079 and #149 as well as a few additional potential edge cases I could come up with.

Breaking Changes

n/a

Types of changes

• Bug fix (non-breaking change which fixes an issue)

Checklist

• I have read the MCP Documentation
• My code follows the repository's style guidelines
• New and existing tests pass locally
• I have added appropriate error handling

Additional context

[changeset-bot]

⚠️ No Changeset found

Latest commit: a6509f6

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

[pkg-pr-new]

Open in StackBlitz

@modelcontextprotocol/client

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/client@1396

@modelcontextprotocol/server

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/server@1396

@modelcontextprotocol/express

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/express@1396

@modelcontextprotocol/hono

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/hono@1396

@modelcontextprotocol/node

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/node@1396

commit: a6509f6

[mgyarmathy]

v1.x patch for this bugfix is here: #1083

[felixweinberger]

Thanks for the contribution! Closing in favor of #1785, which builds on your implementation with a small refinement: absent query parameters are omitted from the result rather than set to ''. This preserves round-trip fidelity with expand() and lets callers distinguish absent from empty. Your implementation approach (path/query split, Map-based parsing, URL decoding) is preserved and credited. Thanks again for the thorough fix across both branches!

[mgyarmathy]

Thanks @felixweinberger!