Skip to content

test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern#2312

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

Merged
felixweinberger merged 2 commits into from
Jun 16, 2026
+27 −8
Merged

test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern #2312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02b0269
test(e2e): harden the entryModern arm against negotiation and envelop…
felixweinberger Jun 16, 2026
e843eab
test(e2e): run two transport-restricted requirements through the entr…
felixweinberger Jun 16, 2026
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
27 changes: 23 additions & 4 deletions test/e2e/helpers/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,7 @@ export async function wire(
clientTx = attachModernEnvelope(clientTx);
}
await client.connect(sniffTransport(clientTx, 'client', sniff));
if (transport === 'entryModern') assertModernNegotiation(client);
return {
fetch,
url,
Expand DownExpand Up@@ -351,15 +352,33 @@ function pinModernNegotiation(client: Client): void {
internals._versionNegotiation ??= { mode: { pin: MODERN_REVISION } };
}

/**
* Fail fast if an entryModern connection did not actually negotiate the
* 2026-07-28 revision. Every cell on the arm asserts modern-path behavior, so
* a broken negotiation pin (or a regression in the discover negotiation) would
* otherwise surface as hundreds of unrelated downstream assertion failures;
* this turns it into one attributable arm-level error right after connect.
*/
function assertModernNegotiation(client: Client): void {
const negotiated = client.getNegotiatedProtocolVersion();
if (negotiated !== MODERN_REVISION) {
throw new Error(
`entryModern arm: expected the connection to negotiate protocol version ${MODERN_REVISION}, but it negotiated ${negotiated ?? 'no version'}`
);
}
}

/**
* The per-request `_meta` envelope stop-gap for the entryModern arm: the
* negotiating client only attaches the envelope to its `server/discover` probe
* today (automatic per-request emission is a client-side follow-up), so the
* harness re-attaches the same envelope to every later request and notification
* the scenario's typed calls put on the wire. The envelope is captured from the
* probe itself, so it always matches what the client actually claimed; messages
* that already carry a protocol-version claim (the probe, or a scenario's
* explicitly enveloped request) pass through untouched.
* latest enveloped message the client sent (normally the probe), so it always
* matches the most recent claim the client actually made — a connection that
* renegotiated would not keep stamping a stale version; messages that already
* carry a protocol-version claim (the probe, or a scenario's explicitly
* enveloped request) pass through untouched.
*
* Applied beneath the wire sniffer and `tapWire`, so recorded traffic shows the
* messages exactly as the scenario sent them while the wire carries the
Expand All@@ -374,7 +393,7 @@ function attachModernEnvelope<T extends SdkTransport>(transport: T): T {
const params = (message.params ?? {}) as { _meta?: Record<string, unknown> };
const meta = params._meta;
if (meta?.[PROTOCOL_VERSION_META_KEY] !== undefined) {
envelope ??= {
envelope = {
[PROTOCOL_VERSION_META_KEY]: meta[PROTOCOL_VERSION_META_KEY],
[CLIENT_INFO_META_KEY]: meta[CLIENT_INFO_META_KEY],
[CLIENT_CAPABILITIES_META_KEY]: meta[CLIENT_CAPABILITIES_META_KEY]
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/requirements.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2145,11 +2145,11 @@ export const REQUIREMENTS: Record<string, Requirement> = {
note: 'This is an HTTP-specific flow requiring session management; the matrix transport arg is ignored, so it runs as a single streamableHttp-labelled cell to avoid duplicate runs.'
},
'flow:tool-result:resource-link-follow': {
transports: STATEFUL_TRANSPORTS,
transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
source: 'https://modelcontextprotocol.io/specification/2025-11-25/server/tools#resource-links',
behavior:
'A resource_link returned by a tool call can be followed with resources/read on the linked URI to retrieve the referenced contents.',
note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the body is plain client→server request/response (a tools/call, then a resources/read against the same statically-registered factory), so the per-request entry serves it on both eras.'
},
'flow:proxy:forward-tools-resources': {
transports: ['inMemory', 'streamableHttp'],
Expand DownExpand Up@@ -2367,8 +2367,8 @@ export const REQUIREMENTS: Record<string, Requirement> = {
source: 'sdk',
behavior:
'A notification handler registered for a non-spec method with a params schema receives schema-validated custom notifications sent by the remote side.',
transports: STATEFUL_TRANSPORTS,
note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the server→client heartbeats are emitted during the tools/call exchange (ctx.mcpReq.notify) and observed after it completes, and the client→server heartbeat is a plain notification handled by the per-request instance, so the entry arms serve the body on both eras.'
},
'typescript:method-string-handlers:result-type-inference': {
entryExclusions: [{ arm: 'entryModern', reason: 'method-not-in-modern-registry' }],
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern by felixweinberger · Pull Request #2312 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern#2312

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

 Merged

felixweinberger
merged 2 commits into

from

Jun 16, 2026

+27

−8

 Merged


test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern
#2312
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02b0269

test(e2e): harden the entryModern arm against negotiation and envelop…


felixweinberger Jun 16, 2026
e843eab

test(e2e): run two transport-restricted requirements through the entr…


felixweinberger Jun 16, 2026

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


27 changes: 23 additions & 4 deletions
test/e2e/helpers/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,7 @@ export async function wire(
 clientTx = attachModernEnvelope(clientTx);
 }
 await client.connect(sniffTransport(clientTx, 'client', sniff));
 if (transport === 'entryModern') assertModernNegotiation(client);
 return {
 fetch,
 url,
Expand DownExpand Up@@ -351,15 +352,33 @@ function pinModernNegotiation(client: Client): void {
 internals._versionNegotiation ??= { mode: { pin: MODERN_REVISION } };
}

/**
 * Fail fast if an entryModern connection did not actually negotiate the
 * 2026-07-28 revision. Every cell on the arm asserts modern-path behavior, so
 * a broken negotiation pin (or a regression in the discover negotiation) would
 * otherwise surface as hundreds of unrelated downstream assertion failures;
 * this turns it into one attributable arm-level error right after connect.
 */
function assertModernNegotiation(client: Client): void {
 const negotiated = client.getNegotiatedProtocolVersion();
 if (negotiated !== MODERN_REVISION) {
 throw new Error(
 `entryModern arm: expected the connection to negotiate protocol version ${MODERN_REVISION}, but it negotiated ${negotiated ?? 'no version'}`
 );
 }
}

/**
 * The per-request `_meta` envelope stop-gap for the entryModern arm: the
 * negotiating client only attaches the envelope to its `server/discover` probe
 * today (automatic per-request emission is a client-side follow-up), so the
 * harness re-attaches the same envelope to every later request and notification
 * the scenario's typed calls put on the wire. The envelope is captured from the
 * probe itself, so it always matches what the client actually claimed; messages
 * that already carry a protocol-version claim (the probe, or a scenario's
 * explicitly enveloped request) pass through untouched.
 * latest enveloped message the client sent (normally the probe), so it always
 * matches the most recent claim the client actually made — a connection that
 * renegotiated would not keep stamping a stale version; messages that already
 * carry a protocol-version claim (the probe, or a scenario's explicitly
 * enveloped request) pass through untouched.
 *
 * Applied beneath the wire sniffer and `tapWire`, so recorded traffic shows the
 * messages exactly as the scenario sent them while the wire carries the
Expand All@@ -374,7 +393,7 @@ function attachModernEnvelope<T extends SdkTransport>(transport: T): T {
 const params = (message.params ?? {}) as { _meta?: Record<string, unknown> };
 const meta = params._meta;
 if (meta?.[PROTOCOL_VERSION_META_KEY] !== undefined) {
 envelope ??= {
 envelope = {
 [PROTOCOL_VERSION_META_KEY]: meta[PROTOCOL_VERSION_META_KEY],
 [CLIENT_INFO_META_KEY]: meta[CLIENT_INFO_META_KEY],
 [CLIENT_CAPABILITIES_META_KEY]: meta[CLIENT_CAPABILITIES_META_KEY]
Expand Down

8 changes: 4 additions & 4 deletions
test/e2e/requirements.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2145,11 +2145,11 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 note: 'This is an HTTP-specific flow requiring session management; the matrix transport arg is ignored, so it runs as a single streamableHttp-labelled cell to avoid duplicate runs.'
 },
 'flow:tool-result:resource-link-follow': {
 transports: STATEFUL_TRANSPORTS,
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 source: 'https://modelcontextprotocol.io/specification/2025-11-25/server/tools#resource-links',
 behavior:
 'A resource_link returned by a tool call can be followed with resources/read on the linked URI to retrieve the referenced contents.',
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the body is plain client→server request/response (a tools/call, then a resources/read against the same statically-registered factory), so the per-request entry serves it on both eras.'
 },
 'flow:proxy:forward-tools-resources': {
 transports: ['inMemory', 'streamableHttp'],
Expand DownExpand Up@@ -2367,8 +2367,8 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 source: 'sdk',
 behavior:
 'A notification handler registered for a non-spec method with a params schema receives schema-validated custom notifications sent by the remote side.',
 transports: STATEFUL_TRANSPORTS,
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the server→client heartbeats are emitted during the tools/call exchange (ctx.mcpReq.notify) and observed after it completes, and the client→server heartbeat is a plain notification handled by the per-request instance, so the entry arms serve the body on both eras.'
 },
 'typescript:method-string-handlers:result-type-inference': {
 entryExclusions: [{ arm: 'entryModern', reason: 'method-not-in-modern-registry' }],
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern by felixweinberger · Pull Request #2312 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern#2312

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

 Merged

felixweinberger
merged 2 commits into

from

Jun 16, 2026

+27

−8

 Merged


test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern
#2312
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02b0269

test(e2e): harden the entryModern arm against negotiation and envelop…


felixweinberger Jun 16, 2026
e843eab

test(e2e): run two transport-restricted requirements through the entr…


felixweinberger Jun 16, 2026

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


27 changes: 23 additions & 4 deletions
test/e2e/helpers/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,7 @@ export async function wire(
 clientTx = attachModernEnvelope(clientTx);
 }
 await client.connect(sniffTransport(clientTx, 'client', sniff));
 if (transport === 'entryModern') assertModernNegotiation(client);
 return {
 fetch,
 url,
Expand DownExpand Up@@ -351,15 +352,33 @@ function pinModernNegotiation(client: Client): void {
 internals._versionNegotiation ??= { mode: { pin: MODERN_REVISION } };
}

/**
 * Fail fast if an entryModern connection did not actually negotiate the
 * 2026-07-28 revision. Every cell on the arm asserts modern-path behavior, so
 * a broken negotiation pin (or a regression in the discover negotiation) would
 * otherwise surface as hundreds of unrelated downstream assertion failures;
 * this turns it into one attributable arm-level error right after connect.
 */
function assertModernNegotiation(client: Client): void {
 const negotiated = client.getNegotiatedProtocolVersion();
 if (negotiated !== MODERN_REVISION) {
 throw new Error(
 `entryModern arm: expected the connection to negotiate protocol version ${MODERN_REVISION}, but it negotiated ${negotiated ?? 'no version'}`
 );
 }
}

/**
 * The per-request `_meta` envelope stop-gap for the entryModern arm: the
 * negotiating client only attaches the envelope to its `server/discover` probe
 * today (automatic per-request emission is a client-side follow-up), so the
 * harness re-attaches the same envelope to every later request and notification
 * the scenario's typed calls put on the wire. The envelope is captured from the
 * probe itself, so it always matches what the client actually claimed; messages
 * that already carry a protocol-version claim (the probe, or a scenario's
 * explicitly enveloped request) pass through untouched.
 * latest enveloped message the client sent (normally the probe), so it always
 * matches the most recent claim the client actually made — a connection that
 * renegotiated would not keep stamping a stale version; messages that already
 * carry a protocol-version claim (the probe, or a scenario's explicitly
 * enveloped request) pass through untouched.
 *
 * Applied beneath the wire sniffer and `tapWire`, so recorded traffic shows the
 * messages exactly as the scenario sent them while the wire carries the
Expand All@@ -374,7 +393,7 @@ function attachModernEnvelope<T extends SdkTransport>(transport: T): T {
 const params = (message.params ?? {}) as { _meta?: Record<string, unknown> };
 const meta = params._meta;
 if (meta?.[PROTOCOL_VERSION_META_KEY] !== undefined) {
 envelope ??= {
 envelope = {
 [PROTOCOL_VERSION_META_KEY]: meta[PROTOCOL_VERSION_META_KEY],
 [CLIENT_INFO_META_KEY]: meta[CLIENT_INFO_META_KEY],
 [CLIENT_CAPABILITIES_META_KEY]: meta[CLIENT_CAPABILITIES_META_KEY]
Expand Down

8 changes: 4 additions & 4 deletions
test/e2e/requirements.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2145,11 +2145,11 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 note: 'This is an HTTP-specific flow requiring session management; the matrix transport arg is ignored, so it runs as a single streamableHttp-labelled cell to avoid duplicate runs.'
 },
 'flow:tool-result:resource-link-follow': {
 transports: STATEFUL_TRANSPORTS,
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 source: 'https://modelcontextprotocol.io/specification/2025-11-25/server/tools#resource-links',
 behavior:
 'A resource_link returned by a tool call can be followed with resources/read on the linked URI to retrieve the referenced contents.',
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the body is plain client→server request/response (a tools/call, then a resources/read against the same statically-registered factory), so the per-request entry serves it on both eras.'
 },
 'flow:proxy:forward-tools-resources': {
 transports: ['inMemory', 'streamableHttp'],
Expand DownExpand Up@@ -2367,8 +2367,8 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 source: 'sdk',
 behavior:
 'A notification handler registered for a non-spec method with a params schema receives schema-validated custom notifications sent by the remote side.',
 transports: STATEFUL_TRANSPORTS,
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the server→client heartbeats are emitted during the tools/call exchange (ctx.mcpReq.notify) and observed after it completes, and the client→server heartbeat is a plain notification handled by the per-request instance, so the entry arms serve the body on both eras.'
 },
 'typescript:method-string-handlers:result-type-inference': {
 entryExclusions: [{ arm: 'entryModern', reason: 'method-not-in-modern-registry' }],
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern by felixweinberger · Pull Request #2312 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern#2312

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

 Merged

felixweinberger
merged 2 commits into

from

Jun 16, 2026

+27

−8

 Merged


test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern
#2312
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02b0269

test(e2e): harden the entryModern arm against negotiation and envelop…


felixweinberger Jun 16, 2026
e843eab

test(e2e): run two transport-restricted requirements through the entr…


felixweinberger Jun 16, 2026

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


27 changes: 23 additions & 4 deletions
test/e2e/helpers/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,7 @@ export async function wire(
 clientTx = attachModernEnvelope(clientTx);
 }
 await client.connect(sniffTransport(clientTx, 'client', sniff));
 if (transport === 'entryModern') assertModernNegotiation(client);
 return {
 fetch,
 url,
Expand DownExpand Up@@ -351,15 +352,33 @@ function pinModernNegotiation(client: Client): void {
 internals._versionNegotiation ??= { mode: { pin: MODERN_REVISION } };
}

/**
 * Fail fast if an entryModern connection did not actually negotiate the
 * 2026-07-28 revision. Every cell on the arm asserts modern-path behavior, so
 * a broken negotiation pin (or a regression in the discover negotiation) would
 * otherwise surface as hundreds of unrelated downstream assertion failures;
 * this turns it into one attributable arm-level error right after connect.
 */
function assertModernNegotiation(client: Client): void {
 const negotiated = client.getNegotiatedProtocolVersion();
 if (negotiated !== MODERN_REVISION) {
 throw new Error(
 `entryModern arm: expected the connection to negotiate protocol version ${MODERN_REVISION}, but it negotiated ${negotiated ?? 'no version'}`
 );
 }
}

/**
 * The per-request `_meta` envelope stop-gap for the entryModern arm: the
 * negotiating client only attaches the envelope to its `server/discover` probe
 * today (automatic per-request emission is a client-side follow-up), so the
 * harness re-attaches the same envelope to every later request and notification
 * the scenario's typed calls put on the wire. The envelope is captured from the
 * probe itself, so it always matches what the client actually claimed; messages
 * that already carry a protocol-version claim (the probe, or a scenario's
 * explicitly enveloped request) pass through untouched.
 * latest enveloped message the client sent (normally the probe), so it always
 * matches the most recent claim the client actually made — a connection that
 * renegotiated would not keep stamping a stale version; messages that already
 * carry a protocol-version claim (the probe, or a scenario's explicitly
 * enveloped request) pass through untouched.
 *
 * Applied beneath the wire sniffer and `tapWire`, so recorded traffic shows the
 * messages exactly as the scenario sent them while the wire carries the
Expand All@@ -374,7 +393,7 @@ function attachModernEnvelope<T extends SdkTransport>(transport: T): T {
 const params = (message.params ?? {}) as { _meta?: Record<string, unknown> };
 const meta = params._meta;
 if (meta?.[PROTOCOL_VERSION_META_KEY] !== undefined) {
 envelope ??= {
 envelope = {
 [PROTOCOL_VERSION_META_KEY]: meta[PROTOCOL_VERSION_META_KEY],
 [CLIENT_INFO_META_KEY]: meta[CLIENT_INFO_META_KEY],
 [CLIENT_CAPABILITIES_META_KEY]: meta[CLIENT_CAPABILITIES_META_KEY]
Expand Down

8 changes: 4 additions & 4 deletions
test/e2e/requirements.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2145,11 +2145,11 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 note: 'This is an HTTP-specific flow requiring session management; the matrix transport arg is ignored, so it runs as a single streamableHttp-labelled cell to avoid duplicate runs.'
 },
 'flow:tool-result:resource-link-follow': {
 transports: STATEFUL_TRANSPORTS,
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 source: 'https://modelcontextprotocol.io/specification/2025-11-25/server/tools#resource-links',
 behavior:
 'A resource_link returned by a tool call can be followed with resources/read on the linked URI to retrieve the referenced contents.',
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the body is plain client→server request/response (a tools/call, then a resources/read against the same statically-registered factory), so the per-request entry serves it on both eras.'
 },
 'flow:proxy:forward-tools-resources': {
 transports: ['inMemory', 'streamableHttp'],
Expand DownExpand Up@@ -2367,8 +2367,8 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 source: 'sdk',
 behavior:
 'A notification handler registered for a non-spec method with a params schema receives schema-validated custom notifications sent by the remote side.',
 transports: STATEFUL_TRANSPORTS,
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the server→client heartbeats are emitted during the tools/call exchange (ctx.mcpReq.notify) and observed after it completes, and the client→server heartbeat is a plain notification handled by the per-request instance, so the entry arms serve the body on both eras.'
 },
 'typescript:method-string-handlers:result-type-inference': {
 entryExclusions: [{ arm: 'entryModern', reason: 'method-not-in-modern-registry' }],
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern by felixweinberger · Pull Request #2312 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern#2312

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

 Merged

felixweinberger
merged 2 commits into

from

Jun 16, 2026

+27

−8

 Merged


test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern
#2312
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02b0269

test(e2e): harden the entryModern arm against negotiation and envelop…


felixweinberger Jun 16, 2026
e843eab

test(e2e): run two transport-restricted requirements through the entr…


felixweinberger Jun 16, 2026

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


27 changes: 23 additions & 4 deletions
test/e2e/helpers/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,7 @@ export async function wire(
 clientTx = attachModernEnvelope(clientTx);
 }
 await client.connect(sniffTransport(clientTx, 'client', sniff));
 if (transport === 'entryModern') assertModernNegotiation(client);
 return {
 fetch,
 url,
Expand DownExpand Up@@ -351,15 +352,33 @@ function pinModernNegotiation(client: Client): void {
 internals._versionNegotiation ??= { mode: { pin: MODERN_REVISION } };
}

/**
 * Fail fast if an entryModern connection did not actually negotiate the
 * 2026-07-28 revision. Every cell on the arm asserts modern-path behavior, so
 * a broken negotiation pin (or a regression in the discover negotiation) would
 * otherwise surface as hundreds of unrelated downstream assertion failures;
 * this turns it into one attributable arm-level error right after connect.
 */
function assertModernNegotiation(client: Client): void {
 const negotiated = client.getNegotiatedProtocolVersion();
 if (negotiated !== MODERN_REVISION) {
 throw new Error(
 `entryModern arm: expected the connection to negotiate protocol version ${MODERN_REVISION}, but it negotiated ${negotiated ?? 'no version'}`
 );
 }
}

/**
 * The per-request `_meta` envelope stop-gap for the entryModern arm: the
 * negotiating client only attaches the envelope to its `server/discover` probe
 * today (automatic per-request emission is a client-side follow-up), so the
 * harness re-attaches the same envelope to every later request and notification
 * the scenario's typed calls put on the wire. The envelope is captured from the
 * probe itself, so it always matches what the client actually claimed; messages
 * that already carry a protocol-version claim (the probe, or a scenario's
 * explicitly enveloped request) pass through untouched.
 * latest enveloped message the client sent (normally the probe), so it always
 * matches the most recent claim the client actually made — a connection that
 * renegotiated would not keep stamping a stale version; messages that already
 * carry a protocol-version claim (the probe, or a scenario's explicitly
 * enveloped request) pass through untouched.
 *
 * Applied beneath the wire sniffer and `tapWire`, so recorded traffic shows the
 * messages exactly as the scenario sent them while the wire carries the
Expand All@@ -374,7 +393,7 @@ function attachModernEnvelope<T extends SdkTransport>(transport: T): T {
 const params = (message.params ?? {}) as { _meta?: Record<string, unknown> };
 const meta = params._meta;
 if (meta?.[PROTOCOL_VERSION_META_KEY] !== undefined) {
 envelope ??= {
 envelope = {
 [PROTOCOL_VERSION_META_KEY]: meta[PROTOCOL_VERSION_META_KEY],
 [CLIENT_INFO_META_KEY]: meta[CLIENT_INFO_META_KEY],
 [CLIENT_CAPABILITIES_META_KEY]: meta[CLIENT_CAPABILITIES_META_KEY]
Expand Down

8 changes: 4 additions & 4 deletions
test/e2e/requirements.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2145,11 +2145,11 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 note: 'This is an HTTP-specific flow requiring session management; the matrix transport arg is ignored, so it runs as a single streamableHttp-labelled cell to avoid duplicate runs.'
 },
 'flow:tool-result:resource-link-follow': {
 transports: STATEFUL_TRANSPORTS,
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 source: 'https://modelcontextprotocol.io/specification/2025-11-25/server/tools#resource-links',
 behavior:
 'A resource_link returned by a tool call can be followed with resources/read on the linked URI to retrieve the referenced contents.',
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the body is plain client→server request/response (a tools/call, then a resources/read against the same statically-registered factory), so the per-request entry serves it on both eras.'
 },
 'flow:proxy:forward-tools-resources': {
 transports: ['inMemory', 'streamableHttp'],
Expand DownExpand Up@@ -2367,8 +2367,8 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 source: 'sdk',
 behavior:
 'A notification handler registered for a non-spec method with a params schema receives schema-validated custom notifications sent by the remote side.',
 transports: STATEFUL_TRANSPORTS,
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the server→client heartbeats are emitted during the tools/call exchange (ctx.mcpReq.notify) and observed after it completes, and the client→server heartbeat is a plain notification handled by the per-request instance, so the entry arms serve the body on both eras.'
 },
 'typescript:method-string-handlers:result-type-inference': {
 entryExclusions: [{ arm: 'entryModern', reason: 'method-not-in-modern-registry' }],
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern by felixweinberger · Pull Request #2312 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern#2312

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

 Merged

felixweinberger
merged 2 commits into

from

Jun 16, 2026

+27

−8

 Merged


test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern
#2312
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02b0269

test(e2e): harden the entryModern arm against negotiation and envelop…


felixweinberger Jun 16, 2026
e843eab

test(e2e): run two transport-restricted requirements through the entr…


felixweinberger Jun 16, 2026

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


27 changes: 23 additions & 4 deletions
test/e2e/helpers/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,7 @@ export async function wire(
 clientTx = attachModernEnvelope(clientTx);
 }
 await client.connect(sniffTransport(clientTx, 'client', sniff));
 if (transport === 'entryModern') assertModernNegotiation(client);
 return {
 fetch,
 url,
Expand DownExpand Up@@ -351,15 +352,33 @@ function pinModernNegotiation(client: Client): void {
 internals._versionNegotiation ??= { mode: { pin: MODERN_REVISION } };
}

/**
 * Fail fast if an entryModern connection did not actually negotiate the
 * 2026-07-28 revision. Every cell on the arm asserts modern-path behavior, so
 * a broken negotiation pin (or a regression in the discover negotiation) would
 * otherwise surface as hundreds of unrelated downstream assertion failures;
 * this turns it into one attributable arm-level error right after connect.
 */
function assertModernNegotiation(client: Client): void {
 const negotiated = client.getNegotiatedProtocolVersion();
 if (negotiated !== MODERN_REVISION) {
 throw new Error(
 `entryModern arm: expected the connection to negotiate protocol version ${MODERN_REVISION}, but it negotiated ${negotiated ?? 'no version'}`
 );
 }
}

/**
 * The per-request `_meta` envelope stop-gap for the entryModern arm: the
 * negotiating client only attaches the envelope to its `server/discover` probe
 * today (automatic per-request emission is a client-side follow-up), so the
 * harness re-attaches the same envelope to every later request and notification
 * the scenario's typed calls put on the wire. The envelope is captured from the
 * probe itself, so it always matches what the client actually claimed; messages
 * that already carry a protocol-version claim (the probe, or a scenario's
 * explicitly enveloped request) pass through untouched.
 * latest enveloped message the client sent (normally the probe), so it always
 * matches the most recent claim the client actually made — a connection that
 * renegotiated would not keep stamping a stale version; messages that already
 * carry a protocol-version claim (the probe, or a scenario's explicitly
 * enveloped request) pass through untouched.
 *
 * Applied beneath the wire sniffer and `tapWire`, so recorded traffic shows the
 * messages exactly as the scenario sent them while the wire carries the
Expand All@@ -374,7 +393,7 @@ function attachModernEnvelope<T extends SdkTransport>(transport: T): T {
 const params = (message.params ?? {}) as { _meta?: Record<string, unknown> };
 const meta = params._meta;
 if (meta?.[PROTOCOL_VERSION_META_KEY] !== undefined) {
 envelope ??= {
 envelope = {
 [PROTOCOL_VERSION_META_KEY]: meta[PROTOCOL_VERSION_META_KEY],
 [CLIENT_INFO_META_KEY]: meta[CLIENT_INFO_META_KEY],
 [CLIENT_CAPABILITIES_META_KEY]: meta[CLIENT_CAPABILITIES_META_KEY]
Expand Down

8 changes: 4 additions & 4 deletions
test/e2e/requirements.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2145,11 +2145,11 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 note: 'This is an HTTP-specific flow requiring session management; the matrix transport arg is ignored, so it runs as a single streamableHttp-labelled cell to avoid duplicate runs.'
 },
 'flow:tool-result:resource-link-follow': {
 transports: STATEFUL_TRANSPORTS,
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 source: 'https://modelcontextprotocol.io/specification/2025-11-25/server/tools#resource-links',
 behavior:
 'A resource_link returned by a tool call can be followed with resources/read on the linked URI to retrieve the referenced contents.',
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the body is plain client→server request/response (a tools/call, then a resources/read against the same statically-registered factory), so the per-request entry serves it on both eras.'
 },
 'flow:proxy:forward-tools-resources': {
 transports: ['inMemory', 'streamableHttp'],
Expand DownExpand Up@@ -2367,8 +2367,8 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 source: 'sdk',
 behavior:
 'A notification handler registered for a non-spec method with a params schema receives schema-validated custom notifications sent by the remote side.',
 transports: STATEFUL_TRANSPORTS,
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the server→client heartbeats are emitted during the tools/call exchange (ctx.mcpReq.notify) and observed after it completes, and the client→server heartbeat is a plain notification handled by the per-request instance, so the entry arms serve the body on both eras.'
 },
 'typescript:method-string-handlers:result-type-inference': {
 entryExclusions: [{ arm: 'entryModern', reason: 'method-not-in-modern-registry' }],
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern by felixweinberger · Pull Request #2312 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern#2312

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

 Merged

felixweinberger
merged 2 commits into

from

Jun 16, 2026

+27

−8

 Merged


test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern
#2312
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02b0269

test(e2e): harden the entryModern arm against negotiation and envelop…


felixweinberger Jun 16, 2026
e843eab

test(e2e): run two transport-restricted requirements through the entr…


felixweinberger Jun 16, 2026

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


27 changes: 23 additions & 4 deletions
test/e2e/helpers/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,7 @@ export async function wire(
 clientTx = attachModernEnvelope(clientTx);
 }
 await client.connect(sniffTransport(clientTx, 'client', sniff));
 if (transport === 'entryModern') assertModernNegotiation(client);
 return {
 fetch,
 url,
Expand DownExpand Up@@ -351,15 +352,33 @@ function pinModernNegotiation(client: Client): void {
 internals._versionNegotiation ??= { mode: { pin: MODERN_REVISION } };
}

/**
 * Fail fast if an entryModern connection did not actually negotiate the
 * 2026-07-28 revision. Every cell on the arm asserts modern-path behavior, so
 * a broken negotiation pin (or a regression in the discover negotiation) would
 * otherwise surface as hundreds of unrelated downstream assertion failures;
 * this turns it into one attributable arm-level error right after connect.
 */
function assertModernNegotiation(client: Client): void {
 const negotiated = client.getNegotiatedProtocolVersion();
 if (negotiated !== MODERN_REVISION) {
 throw new Error(
 `entryModern arm: expected the connection to negotiate protocol version ${MODERN_REVISION}, but it negotiated ${negotiated ?? 'no version'}`
 );
 }
}

/**
 * The per-request `_meta` envelope stop-gap for the entryModern arm: the
 * negotiating client only attaches the envelope to its `server/discover` probe
 * today (automatic per-request emission is a client-side follow-up), so the
 * harness re-attaches the same envelope to every later request and notification
 * the scenario's typed calls put on the wire. The envelope is captured from the
 * probe itself, so it always matches what the client actually claimed; messages
 * that already carry a protocol-version claim (the probe, or a scenario's
 * explicitly enveloped request) pass through untouched.
 * latest enveloped message the client sent (normally the probe), so it always
 * matches the most recent claim the client actually made — a connection that
 * renegotiated would not keep stamping a stale version; messages that already
 * carry a protocol-version claim (the probe, or a scenario's explicitly
 * enveloped request) pass through untouched.
 *
 * Applied beneath the wire sniffer and `tapWire`, so recorded traffic shows the
 * messages exactly as the scenario sent them while the wire carries the
Expand All@@ -374,7 +393,7 @@ function attachModernEnvelope<T extends SdkTransport>(transport: T): T {
 const params = (message.params ?? {}) as { _meta?: Record<string, unknown> };
 const meta = params._meta;
 if (meta?.[PROTOCOL_VERSION_META_KEY] !== undefined) {
 envelope ??= {
 envelope = {
 [PROTOCOL_VERSION_META_KEY]: meta[PROTOCOL_VERSION_META_KEY],
 [CLIENT_INFO_META_KEY]: meta[CLIENT_INFO_META_KEY],
 [CLIENT_CAPABILITIES_META_KEY]: meta[CLIENT_CAPABILITIES_META_KEY]
Expand Down

8 changes: 4 additions & 4 deletions
test/e2e/requirements.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2145,11 +2145,11 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 note: 'This is an HTTP-specific flow requiring session management; the matrix transport arg is ignored, so it runs as a single streamableHttp-labelled cell to avoid duplicate runs.'
 },
 'flow:tool-result:resource-link-follow': {
 transports: STATEFUL_TRANSPORTS,
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 source: 'https://modelcontextprotocol.io/specification/2025-11-25/server/tools#resource-links',
 behavior:
 'A resource_link returned by a tool call can be followed with resources/read on the linked URI to retrieve the referenced contents.',
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the body is plain client→server request/response (a tools/call, then a resources/read against the same statically-registered factory), so the per-request entry serves it on both eras.'
 },
 'flow:proxy:forward-tools-resources': {
 transports: ['inMemory', 'streamableHttp'],
Expand DownExpand Up@@ -2367,8 +2367,8 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 source: 'sdk',
 behavior:
 'A notification handler registered for a non-spec method with a params schema receives schema-validated custom notifications sent by the remote side.',
 transports: STATEFUL_TRANSPORTS,
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the server→client heartbeats are emitted during the tools/call exchange (ctx.mcpReq.notify) and observed after it completes, and the client→server heartbeat is a plain notification handled by the per-request instance, so the entry arms serve the body on both eras.'
 },
 'typescript:method-string-handlers:result-type-inference': {
 entryExclusions: [{ arm: 'entryModern', reason: 'method-not-in-modern-registry' }],
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern by felixweinberger · Pull Request #2312 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content
test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern#2312

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

 Merged

felixweinberger
merged 2 commits into

from

Jun 16, 2026

+27

−8

 Merged


test(e2e): audit transport-restricted requirements for the entry arms; admit two and harden entryModern
#2312
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02b0269

test(e2e): harden the entryModern arm against negotiation and envelop…


felixweinberger Jun 16, 2026
e843eab

test(e2e): run two transport-restricted requirements through the entr…


felixweinberger Jun 16, 2026

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


27 changes: 23 additions & 4 deletions
test/e2e/helpers/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,7 @@ export async function wire(
 clientTx = attachModernEnvelope(clientTx);
 }
 await client.connect(sniffTransport(clientTx, 'client', sniff));
 if (transport === 'entryModern') assertModernNegotiation(client);
 return {
 fetch,
 url,
Expand DownExpand Up@@ -351,15 +352,33 @@ function pinModernNegotiation(client: Client): void {
 internals._versionNegotiation ??= { mode: { pin: MODERN_REVISION } };
}

/**
 * Fail fast if an entryModern connection did not actually negotiate the
 * 2026-07-28 revision. Every cell on the arm asserts modern-path behavior, so
 * a broken negotiation pin (or a regression in the discover negotiation) would
 * otherwise surface as hundreds of unrelated downstream assertion failures;
 * this turns it into one attributable arm-level error right after connect.
 */
function assertModernNegotiation(client: Client): void {
 const negotiated = client.getNegotiatedProtocolVersion();
 if (negotiated !== MODERN_REVISION) {
 throw new Error(
 `entryModern arm: expected the connection to negotiate protocol version ${MODERN_REVISION}, but it negotiated ${negotiated ?? 'no version'}`
 );
 }
}

/**
 * The per-request `_meta` envelope stop-gap for the entryModern arm: the
 * negotiating client only attaches the envelope to its `server/discover` probe
 * today (automatic per-request emission is a client-side follow-up), so the
 * harness re-attaches the same envelope to every later request and notification
 * the scenario's typed calls put on the wire. The envelope is captured from the
 * probe itself, so it always matches what the client actually claimed; messages
 * that already carry a protocol-version claim (the probe, or a scenario's
 * explicitly enveloped request) pass through untouched.
 * latest enveloped message the client sent (normally the probe), so it always
 * matches the most recent claim the client actually made — a connection that
 * renegotiated would not keep stamping a stale version; messages that already
 * carry a protocol-version claim (the probe, or a scenario's explicitly
 * enveloped request) pass through untouched.
 *
 * Applied beneath the wire sniffer and `tapWire`, so recorded traffic shows the
 * messages exactly as the scenario sent them while the wire carries the
Expand All@@ -374,7 +393,7 @@ function attachModernEnvelope<T extends SdkTransport>(transport: T): T {
 const params = (message.params ?? {}) as { _meta?: Record<string, unknown> };
 const meta = params._meta;
 if (meta?.[PROTOCOL_VERSION_META_KEY] !== undefined) {
 envelope ??= {
 envelope = {
 [PROTOCOL_VERSION_META_KEY]: meta[PROTOCOL_VERSION_META_KEY],
 [CLIENT_INFO_META_KEY]: meta[CLIENT_INFO_META_KEY],
 [CLIENT_CAPABILITIES_META_KEY]: meta[CLIENT_CAPABILITIES_META_KEY]
Expand Down

8 changes: 4 additions & 4 deletions
test/e2e/requirements.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2145,11 +2145,11 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 note: 'This is an HTTP-specific flow requiring session management; the matrix transport arg is ignored, so it runs as a single streamableHttp-labelled cell to avoid duplicate runs.'
 },
 'flow:tool-result:resource-link-follow': {
 transports: STATEFUL_TRANSPORTS,
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 source: 'https://modelcontextprotocol.io/specification/2025-11-25/server/tools#resource-links',
 behavior:
 'A resource_link returned by a tool call can be followed with resources/read on the linked URI to retrieve the referenced contents.',
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the body is plain client→server request/response (a tools/call, then a resources/read against the same statically-registered factory), so the per-request entry serves it on both eras.'
 },
 'flow:proxy:forward-tools-resources': {
 transports: ['inMemory', 'streamableHttp'],
Expand DownExpand Up@@ -2367,8 +2367,8 @@ export const REQUIREMENTS: Record<string, Requirement> = {
 source: 'sdk',
 behavior:
 'A notification handler registered for a non-spec method with a params schema receives schema-validated custom notifications sent by the remote side.',
 transports: STATEFUL_TRANSPORTS,
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these.'
 transports: [...STATEFUL_TRANSPORTS, 'entryStateless', 'entryModern'],
 note: 'Stateless hosting creates a fresh server per request and has no standalone GET stream, so there is no server→client channel to deliver/observe these. The createMcpHandler entry arms are included: the server→client heartbeats are emitted during the tools/call exchange (ctx.mcpReq.notify) and observed after it completes, and the client→server heartbeat is a plain notification handled by the per-request instance, so the entry arms serve the body on both eras.'
 },
 'typescript:method-string-handlers:result-type-inference': {
 entryExclusions: [{ arm: 'entryModern', reason: 'method-not-in-modern-registry' }],
Expand Down
Loading