13 changes: 13 additions & 0 deletions .changeset/respect-capability-negotiation.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
---
'@modelcontextprotocol/client': patch
---

Respect capability negotiation in list methods by returning empty lists when server lacks capability

The Client now returns empty lists instead of sending requests to servers that don't advertise the corresponding capability:
- `listPrompts()` returns `{ prompts: [] }` if server lacks prompts capability
- `listResources()` returns `{ resources: [] }` if server lacks resources capability
- `listResourceTemplates()` returns `{ resourceTemplates: [] }` if server lacks resources capability
- `listTools()` returns `{ tools: [] }` if server lacks tools capability

This respects the MCP spec requirement that "Both parties SHOULD respect capability negotiation" and avoids unnecessary server warnings and traffic. The existing `enforceStrictCapabilities` option continues to throw errors when set to `true`.
24 changes: 24 additions & 0 deletions packages/client/src/client/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export class Client<
private _experimental?: { tasks: ExperimentalClientTasks<RequestT, NotificationT, ResultT> };
private _listChangedDebounceTimers: Map<string, ReturnType<typeof setTimeout>> = new Map();
private _pendingListChangedConfig?: ListChangedHandlers;
private _enforceStrictCapabilities: boolean;

/**
* Initializes this client with the given name and version information.
Expand All@@ -264,6 +265,7 @@ export class Client<
super(options);
this._capabilities = options?.capabilities ?? {};
this._jsonSchemaValidator = options?.jsonSchemaValidator ?? new AjvJsonSchemaValidator();
this._enforceStrictCapabilities = options?.enforceStrictCapabilities ?? false;

// Store list changed config for setup after connection (when we know server capabilities)
if (options?.listChanged) {
Expand DownExpand Up@@ -728,14 +730,31 @@ export class Client<
}

async listPrompts(params?: ListPromptsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.prompts && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support prompts
console.debug('Client.listPrompts() called but server does not advertise prompts capability - returning empty list');
return { prompts: [] };
}
return this.request({ method: 'prompts/list', params }, ListPromptsResultSchema, options);
}

async listResources(params?: ListResourcesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug('Client.listResources() called but server does not advertise resources capability - returning empty list');
return { resources: [] };
}
return this.request({ method: 'resources/list', params }, ListResourcesResultSchema, options);
}

async listResourceTemplates(params?: ListResourceTemplatesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug(
'Client.listResourceTemplates() called but server does not advertise resources capability - returning empty list'
);
return { resourceTemplates: [] };
}
return this.request({ method: 'resources/templates/list', params }, ListResourceTemplatesResultSchema, options);
}

Expand DownExpand Up@@ -860,6 +879,11 @@ export class Client<
}

async listTools(params?: ListToolsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.tools && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support tools
console.debug('Client.listTools() called but server does not advertise tools capability - returning empty list');
return { tools: [] };
}
const result = await this.request({ method: 'tools/list', params }, ListToolsResultSchema, options);

// Cache the tools and their output schemas for future validation
Expand Down
79 changes: 76 additions & 3 deletions test/integration/test/client/client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,79 @@ test('should respect server capabilities', async () => {
).rejects.toThrow('Server does not support completions');
});

/***
* Test: Return empty lists for missing capabilities (default behavior)
* When enforceStrictCapabilities is not set (default), list methods should
* return empty lists instead of sending requests to servers that don't
* advertise those capabilities.
*/
test('should return empty lists for missing capabilities by default', async () => {
const server = new Server(
{
name: 'test server',
version: '1.0'
},
{
capabilities: {
// Server only supports tools - no prompts or resources
tools: {}
}
}
);

server.setRequestHandler(InitializeRequestSchema, _request => ({
protocolVersion: LATEST_PROTOCOL_VERSION,
capabilities: {
tools: {}
},
serverInfo: {
name: 'test',
version: '1.0'
}
}));

server.setRequestHandler(ListToolsRequestSchema, () => ({
tools: [{ name: 'test-tool', inputSchema: { type: 'object' } }]
}));

const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();

// Client with default settings (enforceStrictCapabilities not set)
const client = new Client(
{
name: 'test client',
version: '1.0'
},
{
capabilities: {}
}
);

await Promise.all([client.connect(clientTransport), server.connect(serverTransport)]);

// Server only supports tools
expect(client.getServerCapabilities()).toEqual({
tools: {}
});

// listTools should work and return actual tools
const toolsResult = await client.listTools();
expect(toolsResult.tools).toHaveLength(1);
expect(toolsResult.tools[0].name).toBe('test-tool');

// listPrompts should return empty list without sending request
const promptsResult = await client.listPrompts();
expect(promptsResult.prompts).toEqual([]);

// listResources should return empty list without sending request
const resourcesResult = await client.listResources();
expect(resourcesResult.resources).toEqual([]);

// listResourceTemplates should return empty list without sending request
const templatesResult = await client.listResourceTemplates();
expect(templatesResult.resourceTemplates).toEqual([]);
});

/***
* Test: Respect Client Notification Capabilities
*/
Expand DownExpand Up@@ -1885,7 +1958,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -1977,7 +2050,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -2270,7 +2343,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
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" + '
Skip to content
13 changes: 13 additions & 0 deletions .changeset/respect-capability-negotiation.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
---
'@modelcontextprotocol/client': patch
---

Respect capability negotiation in list methods by returning empty lists when server lacks capability

The Client now returns empty lists instead of sending requests to servers that don't advertise the corresponding capability:
- `listPrompts()` returns `{ prompts: [] }` if server lacks prompts capability
- `listResources()` returns `{ resources: [] }` if server lacks resources capability
- `listResourceTemplates()` returns `{ resourceTemplates: [] }` if server lacks resources capability
- `listTools()` returns `{ tools: [] }` if server lacks tools capability

This respects the MCP spec requirement that "Both parties SHOULD respect capability negotiation" and avoids unnecessary server warnings and traffic. The existing `enforceStrictCapabilities` option continues to throw errors when set to `true`.
24 changes: 24 additions & 0 deletions packages/client/src/client/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export class Client<
private _experimental?: { tasks: ExperimentalClientTasks<RequestT, NotificationT, ResultT> };
private _listChangedDebounceTimers: Map<string, ReturnType<typeof setTimeout>> = new Map();
private _pendingListChangedConfig?: ListChangedHandlers;
private _enforceStrictCapabilities: boolean;

/**
* Initializes this client with the given name and version information.
Expand All@@ -264,6 +265,7 @@ export class Client<
super(options);
this._capabilities = options?.capabilities ?? {};
this._jsonSchemaValidator = options?.jsonSchemaValidator ?? new AjvJsonSchemaValidator();
this._enforceStrictCapabilities = options?.enforceStrictCapabilities ?? false;

// Store list changed config for setup after connection (when we know server capabilities)
if (options?.listChanged) {
Expand DownExpand Up@@ -728,14 +730,31 @@ export class Client<
}

async listPrompts(params?: ListPromptsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.prompts && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support prompts
console.debug('Client.listPrompts() called but server does not advertise prompts capability - returning empty list');
return { prompts: [] };
}
return this.request({ method: 'prompts/list', params }, ListPromptsResultSchema, options);
}

async listResources(params?: ListResourcesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug('Client.listResources() called but server does not advertise resources capability - returning empty list');
return { resources: [] };
}
return this.request({ method: 'resources/list', params }, ListResourcesResultSchema, options);
}

async listResourceTemplates(params?: ListResourceTemplatesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug(
'Client.listResourceTemplates() called but server does not advertise resources capability - returning empty list'
);
return { resourceTemplates: [] };
}
return this.request({ method: 'resources/templates/list', params }, ListResourceTemplatesResultSchema, options);
}

Expand DownExpand Up@@ -860,6 +879,11 @@ export class Client<
}

async listTools(params?: ListToolsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.tools && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support tools
console.debug('Client.listTools() called but server does not advertise tools capability - returning empty list');
return { tools: [] };
}
const result = await this.request({ method: 'tools/list', params }, ListToolsResultSchema, options);

// Cache the tools and their output schemas for future validation
Expand Down
79 changes: 76 additions & 3 deletions test/integration/test/client/client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,79 @@ test('should respect server capabilities', async () => {
).rejects.toThrow('Server does not support completions');
});

/***
* Test: Return empty lists for missing capabilities (default behavior)
* When enforceStrictCapabilities is not set (default), list methods should
* return empty lists instead of sending requests to servers that don't
* advertise those capabilities.
*/
test('should return empty lists for missing capabilities by default', async () => {
const server = new Server(
{
name: 'test server',
version: '1.0'
},
{
capabilities: {
// Server only supports tools - no prompts or resources
tools: {}
}
}
);

server.setRequestHandler(InitializeRequestSchema, _request => ({
protocolVersion: LATEST_PROTOCOL_VERSION,
capabilities: {
tools: {}
},
serverInfo: {
name: 'test',
version: '1.0'
}
}));

server.setRequestHandler(ListToolsRequestSchema, () => ({
tools: [{ name: 'test-tool', inputSchema: { type: 'object' } }]
}));

const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();

// Client with default settings (enforceStrictCapabilities not set)
const client = new Client(
{
name: 'test client',
version: '1.0'
},
{
capabilities: {}
}
);

await Promise.all([client.connect(clientTransport), server.connect(serverTransport)]);

// Server only supports tools
expect(client.getServerCapabilities()).toEqual({
tools: {}
});

// listTools should work and return actual tools
const toolsResult = await client.listTools();
expect(toolsResult.tools).toHaveLength(1);
expect(toolsResult.tools[0].name).toBe('test-tool');

// listPrompts should return empty list without sending request
const promptsResult = await client.listPrompts();
expect(promptsResult.prompts).toEqual([]);

// listResources should return empty list without sending request
const resourcesResult = await client.listResources();
expect(resourcesResult.resources).toEqual([]);

// listResourceTemplates should return empty list without sending request
const templatesResult = await client.listResourceTemplates();
expect(templatesResult.resourceTemplates).toEqual([]);
});

/***
* Test: Respect Client Notification Capabilities
*/
Expand DownExpand Up@@ -1885,7 +1958,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -1977,7 +2050,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -2270,7 +2343,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
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('^' + ".*" + '
Skip to content
13 changes: 13 additions & 0 deletions .changeset/respect-capability-negotiation.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
---
'@modelcontextprotocol/client': patch
---

Respect capability negotiation in list methods by returning empty lists when server lacks capability

The Client now returns empty lists instead of sending requests to servers that don't advertise the corresponding capability:
- `listPrompts()` returns `{ prompts: [] }` if server lacks prompts capability
- `listResources()` returns `{ resources: [] }` if server lacks resources capability
- `listResourceTemplates()` returns `{ resourceTemplates: [] }` if server lacks resources capability
- `listTools()` returns `{ tools: [] }` if server lacks tools capability

This respects the MCP spec requirement that "Both parties SHOULD respect capability negotiation" and avoids unnecessary server warnings and traffic. The existing `enforceStrictCapabilities` option continues to throw errors when set to `true`.
24 changes: 24 additions & 0 deletions packages/client/src/client/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export class Client<
private _experimental?: { tasks: ExperimentalClientTasks<RequestT, NotificationT, ResultT> };
private _listChangedDebounceTimers: Map<string, ReturnType<typeof setTimeout>> = new Map();
private _pendingListChangedConfig?: ListChangedHandlers;
private _enforceStrictCapabilities: boolean;

/**
* Initializes this client with the given name and version information.
Expand All@@ -264,6 +265,7 @@ export class Client<
super(options);
this._capabilities = options?.capabilities ?? {};
this._jsonSchemaValidator = options?.jsonSchemaValidator ?? new AjvJsonSchemaValidator();
this._enforceStrictCapabilities = options?.enforceStrictCapabilities ?? false;

// Store list changed config for setup after connection (when we know server capabilities)
if (options?.listChanged) {
Expand DownExpand Up@@ -728,14 +730,31 @@ export class Client<
}

async listPrompts(params?: ListPromptsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.prompts && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support prompts
console.debug('Client.listPrompts() called but server does not advertise prompts capability - returning empty list');
return { prompts: [] };
}
return this.request({ method: 'prompts/list', params }, ListPromptsResultSchema, options);
}

async listResources(params?: ListResourcesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug('Client.listResources() called but server does not advertise resources capability - returning empty list');
return { resources: [] };
}
return this.request({ method: 'resources/list', params }, ListResourcesResultSchema, options);
}

async listResourceTemplates(params?: ListResourceTemplatesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug(
'Client.listResourceTemplates() called but server does not advertise resources capability - returning empty list'
);
return { resourceTemplates: [] };
}
return this.request({ method: 'resources/templates/list', params }, ListResourceTemplatesResultSchema, options);
}

Expand DownExpand Up@@ -860,6 +879,11 @@ export class Client<
}

async listTools(params?: ListToolsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.tools && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support tools
console.debug('Client.listTools() called but server does not advertise tools capability - returning empty list');
return { tools: [] };
}
const result = await this.request({ method: 'tools/list', params }, ListToolsResultSchema, options);

// Cache the tools and their output schemas for future validation
Expand Down
79 changes: 76 additions & 3 deletions test/integration/test/client/client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,79 @@ test('should respect server capabilities', async () => {
).rejects.toThrow('Server does not support completions');
});

/***
* Test: Return empty lists for missing capabilities (default behavior)
* When enforceStrictCapabilities is not set (default), list methods should
* return empty lists instead of sending requests to servers that don't
* advertise those capabilities.
*/
test('should return empty lists for missing capabilities by default', async () => {
const server = new Server(
{
name: 'test server',
version: '1.0'
},
{
capabilities: {
// Server only supports tools - no prompts or resources
tools: {}
}
}
);

server.setRequestHandler(InitializeRequestSchema, _request => ({
protocolVersion: LATEST_PROTOCOL_VERSION,
capabilities: {
tools: {}
},
serverInfo: {
name: 'test',
version: '1.0'
}
}));

server.setRequestHandler(ListToolsRequestSchema, () => ({
tools: [{ name: 'test-tool', inputSchema: { type: 'object' } }]
}));

const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();

// Client with default settings (enforceStrictCapabilities not set)
const client = new Client(
{
name: 'test client',
version: '1.0'
},
{
capabilities: {}
}
);

await Promise.all([client.connect(clientTransport), server.connect(serverTransport)]);

// Server only supports tools
expect(client.getServerCapabilities()).toEqual({
tools: {}
});

// listTools should work and return actual tools
const toolsResult = await client.listTools();
expect(toolsResult.tools).toHaveLength(1);
expect(toolsResult.tools[0].name).toBe('test-tool');

// listPrompts should return empty list without sending request
const promptsResult = await client.listPrompts();
expect(promptsResult.prompts).toEqual([]);

// listResources should return empty list without sending request
const resourcesResult = await client.listResources();
expect(resourcesResult.resources).toEqual([]);

// listResourceTemplates should return empty list without sending request
const templatesResult = await client.listResourceTemplates();
expect(templatesResult.resourceTemplates).toEqual([]);
});

/***
* Test: Respect Client Notification Capabilities
*/
Expand DownExpand Up@@ -1885,7 +1958,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -1977,7 +2050,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -2270,7 +2343,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
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('^' + ".*" + '
Skip to content
13 changes: 13 additions & 0 deletions .changeset/respect-capability-negotiation.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
---
'@modelcontextprotocol/client': patch
---

Respect capability negotiation in list methods by returning empty lists when server lacks capability

The Client now returns empty lists instead of sending requests to servers that don't advertise the corresponding capability:
- `listPrompts()` returns `{ prompts: [] }` if server lacks prompts capability
- `listResources()` returns `{ resources: [] }` if server lacks resources capability
- `listResourceTemplates()` returns `{ resourceTemplates: [] }` if server lacks resources capability
- `listTools()` returns `{ tools: [] }` if server lacks tools capability

This respects the MCP spec requirement that "Both parties SHOULD respect capability negotiation" and avoids unnecessary server warnings and traffic. The existing `enforceStrictCapabilities` option continues to throw errors when set to `true`.
24 changes: 24 additions & 0 deletions packages/client/src/client/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export class Client<
private _experimental?: { tasks: ExperimentalClientTasks<RequestT, NotificationT, ResultT> };
private _listChangedDebounceTimers: Map<string, ReturnType<typeof setTimeout>> = new Map();
private _pendingListChangedConfig?: ListChangedHandlers;
private _enforceStrictCapabilities: boolean;

/**
* Initializes this client with the given name and version information.
Expand All@@ -264,6 +265,7 @@ export class Client<
super(options);
this._capabilities = options?.capabilities ?? {};
this._jsonSchemaValidator = options?.jsonSchemaValidator ?? new AjvJsonSchemaValidator();
this._enforceStrictCapabilities = options?.enforceStrictCapabilities ?? false;

// Store list changed config for setup after connection (when we know server capabilities)
if (options?.listChanged) {
Expand DownExpand Up@@ -728,14 +730,31 @@ export class Client<
}

async listPrompts(params?: ListPromptsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.prompts && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support prompts
console.debug('Client.listPrompts() called but server does not advertise prompts capability - returning empty list');
return { prompts: [] };
}
return this.request({ method: 'prompts/list', params }, ListPromptsResultSchema, options);
}

async listResources(params?: ListResourcesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug('Client.listResources() called but server does not advertise resources capability - returning empty list');
return { resources: [] };
}
return this.request({ method: 'resources/list', params }, ListResourcesResultSchema, options);
}

async listResourceTemplates(params?: ListResourceTemplatesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug(
'Client.listResourceTemplates() called but server does not advertise resources capability - returning empty list'
);
return { resourceTemplates: [] };
}
return this.request({ method: 'resources/templates/list', params }, ListResourceTemplatesResultSchema, options);
}

Expand DownExpand Up@@ -860,6 +879,11 @@ export class Client<
}

async listTools(params?: ListToolsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.tools && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support tools
console.debug('Client.listTools() called but server does not advertise tools capability - returning empty list');
return { tools: [] };
}
const result = await this.request({ method: 'tools/list', params }, ListToolsResultSchema, options);

// Cache the tools and their output schemas for future validation
Expand Down
79 changes: 76 additions & 3 deletions test/integration/test/client/client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,79 @@ test('should respect server capabilities', async () => {
).rejects.toThrow('Server does not support completions');
});

/***
* Test: Return empty lists for missing capabilities (default behavior)
* When enforceStrictCapabilities is not set (default), list methods should
* return empty lists instead of sending requests to servers that don't
* advertise those capabilities.
*/
test('should return empty lists for missing capabilities by default', async () => {
const server = new Server(
{
name: 'test server',
version: '1.0'
},
{
capabilities: {
// Server only supports tools - no prompts or resources
tools: {}
}
}
);

server.setRequestHandler(InitializeRequestSchema, _request => ({
protocolVersion: LATEST_PROTOCOL_VERSION,
capabilities: {
tools: {}
},
serverInfo: {
name: 'test',
version: '1.0'
}
}));

server.setRequestHandler(ListToolsRequestSchema, () => ({
tools: [{ name: 'test-tool', inputSchema: { type: 'object' } }]
}));

const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();

// Client with default settings (enforceStrictCapabilities not set)
const client = new Client(
{
name: 'test client',
version: '1.0'
},
{
capabilities: {}
}
);

await Promise.all([client.connect(clientTransport), server.connect(serverTransport)]);

// Server only supports tools
expect(client.getServerCapabilities()).toEqual({
tools: {}
});

// listTools should work and return actual tools
const toolsResult = await client.listTools();
expect(toolsResult.tools).toHaveLength(1);
expect(toolsResult.tools[0].name).toBe('test-tool');

// listPrompts should return empty list without sending request
const promptsResult = await client.listPrompts();
expect(promptsResult.prompts).toEqual([]);

// listResources should return empty list without sending request
const resourcesResult = await client.listResources();
expect(resourcesResult.resources).toEqual([]);

// listResourceTemplates should return empty list without sending request
const templatesResult = await client.listResourceTemplates();
expect(templatesResult.resourceTemplates).toEqual([]);
});

/***
* Test: Respect Client Notification Capabilities
*/
Expand DownExpand Up@@ -1885,7 +1958,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -1977,7 +2050,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -2270,7 +2343,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
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" + '
Skip to content
13 changes: 13 additions & 0 deletions .changeset/respect-capability-negotiation.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
---
'@modelcontextprotocol/client': patch
---

Respect capability negotiation in list methods by returning empty lists when server lacks capability

The Client now returns empty lists instead of sending requests to servers that don't advertise the corresponding capability:
- `listPrompts()` returns `{ prompts: [] }` if server lacks prompts capability
- `listResources()` returns `{ resources: [] }` if server lacks resources capability
- `listResourceTemplates()` returns `{ resourceTemplates: [] }` if server lacks resources capability
- `listTools()` returns `{ tools: [] }` if server lacks tools capability

This respects the MCP spec requirement that "Both parties SHOULD respect capability negotiation" and avoids unnecessary server warnings and traffic. The existing `enforceStrictCapabilities` option continues to throw errors when set to `true`.
24 changes: 24 additions & 0 deletions packages/client/src/client/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export class Client<
private _experimental?: { tasks: ExperimentalClientTasks<RequestT, NotificationT, ResultT> };
private _listChangedDebounceTimers: Map<string, ReturnType<typeof setTimeout>> = new Map();
private _pendingListChangedConfig?: ListChangedHandlers;
private _enforceStrictCapabilities: boolean;

/**
* Initializes this client with the given name and version information.
Expand All@@ -264,6 +265,7 @@ export class Client<
super(options);
this._capabilities = options?.capabilities ?? {};
this._jsonSchemaValidator = options?.jsonSchemaValidator ?? new AjvJsonSchemaValidator();
this._enforceStrictCapabilities = options?.enforceStrictCapabilities ?? false;

// Store list changed config for setup after connection (when we know server capabilities)
if (options?.listChanged) {
Expand DownExpand Up@@ -728,14 +730,31 @@ export class Client<
}

async listPrompts(params?: ListPromptsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.prompts && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support prompts
console.debug('Client.listPrompts() called but server does not advertise prompts capability - returning empty list');
return { prompts: [] };
}
return this.request({ method: 'prompts/list', params }, ListPromptsResultSchema, options);
}

async listResources(params?: ListResourcesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug('Client.listResources() called but server does not advertise resources capability - returning empty list');
return { resources: [] };
}
return this.request({ method: 'resources/list', params }, ListResourcesResultSchema, options);
}

async listResourceTemplates(params?: ListResourceTemplatesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug(
'Client.listResourceTemplates() called but server does not advertise resources capability - returning empty list'
);
return { resourceTemplates: [] };
}
return this.request({ method: 'resources/templates/list', params }, ListResourceTemplatesResultSchema, options);
}

Expand DownExpand Up@@ -860,6 +879,11 @@ export class Client<
}

async listTools(params?: ListToolsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.tools && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support tools
console.debug('Client.listTools() called but server does not advertise tools capability - returning empty list');
return { tools: [] };
}
const result = await this.request({ method: 'tools/list', params }, ListToolsResultSchema, options);

// Cache the tools and their output schemas for future validation
Expand Down
79 changes: 76 additions & 3 deletions test/integration/test/client/client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,79 @@ test('should respect server capabilities', async () => {
).rejects.toThrow('Server does not support completions');
});

/***
* Test: Return empty lists for missing capabilities (default behavior)
* When enforceStrictCapabilities is not set (default), list methods should
* return empty lists instead of sending requests to servers that don't
* advertise those capabilities.
*/
test('should return empty lists for missing capabilities by default', async () => {
const server = new Server(
{
name: 'test server',
version: '1.0'
},
{
capabilities: {
// Server only supports tools - no prompts or resources
tools: {}
}
}
);

server.setRequestHandler(InitializeRequestSchema, _request => ({
protocolVersion: LATEST_PROTOCOL_VERSION,
capabilities: {
tools: {}
},
serverInfo: {
name: 'test',
version: '1.0'
}
}));

server.setRequestHandler(ListToolsRequestSchema, () => ({
tools: [{ name: 'test-tool', inputSchema: { type: 'object' } }]
}));

const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();

// Client with default settings (enforceStrictCapabilities not set)
const client = new Client(
{
name: 'test client',
version: '1.0'
},
{
capabilities: {}
}
);

await Promise.all([client.connect(clientTransport), server.connect(serverTransport)]);

// Server only supports tools
expect(client.getServerCapabilities()).toEqual({
tools: {}
});

// listTools should work and return actual tools
const toolsResult = await client.listTools();
expect(toolsResult.tools).toHaveLength(1);
expect(toolsResult.tools[0].name).toBe('test-tool');

// listPrompts should return empty list without sending request
const promptsResult = await client.listPrompts();
expect(promptsResult.prompts).toEqual([]);

// listResources should return empty list without sending request
const resourcesResult = await client.listResources();
expect(resourcesResult.resources).toEqual([]);

// listResourceTemplates should return empty list without sending request
const templatesResult = await client.listResourceTemplates();
expect(templatesResult.resourceTemplates).toEqual([]);
});

/***
* Test: Respect Client Notification Capabilities
*/
Expand DownExpand Up@@ -1885,7 +1958,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -1977,7 +2050,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -2270,7 +2343,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
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('^' + ".*" + '
Skip to content
13 changes: 13 additions & 0 deletions .changeset/respect-capability-negotiation.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
---
'@modelcontextprotocol/client': patch
---

Respect capability negotiation in list methods by returning empty lists when server lacks capability

The Client now returns empty lists instead of sending requests to servers that don't advertise the corresponding capability:
- `listPrompts()` returns `{ prompts: [] }` if server lacks prompts capability
- `listResources()` returns `{ resources: [] }` if server lacks resources capability
- `listResourceTemplates()` returns `{ resourceTemplates: [] }` if server lacks resources capability
- `listTools()` returns `{ tools: [] }` if server lacks tools capability

This respects the MCP spec requirement that "Both parties SHOULD respect capability negotiation" and avoids unnecessary server warnings and traffic. The existing `enforceStrictCapabilities` option continues to throw errors when set to `true`.
24 changes: 24 additions & 0 deletions packages/client/src/client/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export class Client<
private _experimental?: { tasks: ExperimentalClientTasks<RequestT, NotificationT, ResultT> };
private _listChangedDebounceTimers: Map<string, ReturnType<typeof setTimeout>> = new Map();
private _pendingListChangedConfig?: ListChangedHandlers;
private _enforceStrictCapabilities: boolean;

/**
* Initializes this client with the given name and version information.
Expand All@@ -264,6 +265,7 @@ export class Client<
super(options);
this._capabilities = options?.capabilities ?? {};
this._jsonSchemaValidator = options?.jsonSchemaValidator ?? new AjvJsonSchemaValidator();
this._enforceStrictCapabilities = options?.enforceStrictCapabilities ?? false;

// Store list changed config for setup after connection (when we know server capabilities)
if (options?.listChanged) {
Expand DownExpand Up@@ -728,14 +730,31 @@ export class Client<
}

async listPrompts(params?: ListPromptsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.prompts && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support prompts
console.debug('Client.listPrompts() called but server does not advertise prompts capability - returning empty list');
return { prompts: [] };
}
return this.request({ method: 'prompts/list', params }, ListPromptsResultSchema, options);
}

async listResources(params?: ListResourcesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug('Client.listResources() called but server does not advertise resources capability - returning empty list');
return { resources: [] };
}
return this.request({ method: 'resources/list', params }, ListResourcesResultSchema, options);
}

async listResourceTemplates(params?: ListResourceTemplatesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug(
'Client.listResourceTemplates() called but server does not advertise resources capability - returning empty list'
);
return { resourceTemplates: [] };
}
return this.request({ method: 'resources/templates/list', params }, ListResourceTemplatesResultSchema, options);
}

Expand DownExpand Up@@ -860,6 +879,11 @@ export class Client<
}

async listTools(params?: ListToolsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.tools && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support tools
console.debug('Client.listTools() called but server does not advertise tools capability - returning empty list');
return { tools: [] };
}
const result = await this.request({ method: 'tools/list', params }, ListToolsResultSchema, options);

// Cache the tools and their output schemas for future validation
Expand Down
79 changes: 76 additions & 3 deletions test/integration/test/client/client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,79 @@ test('should respect server capabilities', async () => {
).rejects.toThrow('Server does not support completions');
});

/***
* Test: Return empty lists for missing capabilities (default behavior)
* When enforceStrictCapabilities is not set (default), list methods should
* return empty lists instead of sending requests to servers that don't
* advertise those capabilities.
*/
test('should return empty lists for missing capabilities by default', async () => {
const server = new Server(
{
name: 'test server',
version: '1.0'
},
{
capabilities: {
// Server only supports tools - no prompts or resources
tools: {}
}
}
);

server.setRequestHandler(InitializeRequestSchema, _request => ({
protocolVersion: LATEST_PROTOCOL_VERSION,
capabilities: {
tools: {}
},
serverInfo: {
name: 'test',
version: '1.0'
}
}));

server.setRequestHandler(ListToolsRequestSchema, () => ({
tools: [{ name: 'test-tool', inputSchema: { type: 'object' } }]
}));

const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();

// Client with default settings (enforceStrictCapabilities not set)
const client = new Client(
{
name: 'test client',
version: '1.0'
},
{
capabilities: {}
}
);

await Promise.all([client.connect(clientTransport), server.connect(serverTransport)]);

// Server only supports tools
expect(client.getServerCapabilities()).toEqual({
tools: {}
});

// listTools should work and return actual tools
const toolsResult = await client.listTools();
expect(toolsResult.tools).toHaveLength(1);
expect(toolsResult.tools[0].name).toBe('test-tool');

// listPrompts should return empty list without sending request
const promptsResult = await client.listPrompts();
expect(promptsResult.prompts).toEqual([]);

// listResources should return empty list without sending request
const resourcesResult = await client.listResources();
expect(resourcesResult.resources).toEqual([]);

// listResourceTemplates should return empty list without sending request
const templatesResult = await client.listResourceTemplates();
expect(templatesResult.resourceTemplates).toEqual([]);
});

/***
* Test: Respect Client Notification Capabilities
*/
Expand DownExpand Up@@ -1885,7 +1958,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -1977,7 +2050,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -2270,7 +2343,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
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('^' + ".*" + '
Skip to content
13 changes: 13 additions & 0 deletions .changeset/respect-capability-negotiation.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
---
'@modelcontextprotocol/client': patch
---

Respect capability negotiation in list methods by returning empty lists when server lacks capability

The Client now returns empty lists instead of sending requests to servers that don't advertise the corresponding capability:
- `listPrompts()` returns `{ prompts: [] }` if server lacks prompts capability
- `listResources()` returns `{ resources: [] }` if server lacks resources capability
- `listResourceTemplates()` returns `{ resourceTemplates: [] }` if server lacks resources capability
- `listTools()` returns `{ tools: [] }` if server lacks tools capability

This respects the MCP spec requirement that "Both parties SHOULD respect capability negotiation" and avoids unnecessary server warnings and traffic. The existing `enforceStrictCapabilities` option continues to throw errors when set to `true`.
24 changes: 24 additions & 0 deletions packages/client/src/client/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export class Client<
private _experimental?: { tasks: ExperimentalClientTasks<RequestT, NotificationT, ResultT> };
private _listChangedDebounceTimers: Map<string, ReturnType<typeof setTimeout>> = new Map();
private _pendingListChangedConfig?: ListChangedHandlers;
private _enforceStrictCapabilities: boolean;

/**
* Initializes this client with the given name and version information.
Expand All@@ -264,6 +265,7 @@ export class Client<
super(options);
this._capabilities = options?.capabilities ?? {};
this._jsonSchemaValidator = options?.jsonSchemaValidator ?? new AjvJsonSchemaValidator();
this._enforceStrictCapabilities = options?.enforceStrictCapabilities ?? false;

// Store list changed config for setup after connection (when we know server capabilities)
if (options?.listChanged) {
Expand DownExpand Up@@ -728,14 +730,31 @@ export class Client<
}

async listPrompts(params?: ListPromptsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.prompts && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support prompts
console.debug('Client.listPrompts() called but server does not advertise prompts capability - returning empty list');
return { prompts: [] };
}
return this.request({ method: 'prompts/list', params }, ListPromptsResultSchema, options);
}

async listResources(params?: ListResourcesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug('Client.listResources() called but server does not advertise resources capability - returning empty list');
return { resources: [] };
}
return this.request({ method: 'resources/list', params }, ListResourcesResultSchema, options);
}

async listResourceTemplates(params?: ListResourceTemplatesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug(
'Client.listResourceTemplates() called but server does not advertise resources capability - returning empty list'
);
return { resourceTemplates: [] };
}
return this.request({ method: 'resources/templates/list', params }, ListResourceTemplatesResultSchema, options);
}

Expand DownExpand Up@@ -860,6 +879,11 @@ export class Client<
}

async listTools(params?: ListToolsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.tools && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support tools
console.debug('Client.listTools() called but server does not advertise tools capability - returning empty list');
return { tools: [] };
}
const result = await this.request({ method: 'tools/list', params }, ListToolsResultSchema, options);

// Cache the tools and their output schemas for future validation
Expand Down
79 changes: 76 additions & 3 deletions test/integration/test/client/client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,79 @@ test('should respect server capabilities', async () => {
).rejects.toThrow('Server does not support completions');
});

/***
* Test: Return empty lists for missing capabilities (default behavior)
* When enforceStrictCapabilities is not set (default), list methods should
* return empty lists instead of sending requests to servers that don't
* advertise those capabilities.
*/
test('should return empty lists for missing capabilities by default', async () => {
const server = new Server(
{
name: 'test server',
version: '1.0'
},
{
capabilities: {
// Server only supports tools - no prompts or resources
tools: {}
}
}
);

server.setRequestHandler(InitializeRequestSchema, _request => ({
protocolVersion: LATEST_PROTOCOL_VERSION,
capabilities: {
tools: {}
},
serverInfo: {
name: 'test',
version: '1.0'
}
}));

server.setRequestHandler(ListToolsRequestSchema, () => ({
tools: [{ name: 'test-tool', inputSchema: { type: 'object' } }]
}));

const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();

// Client with default settings (enforceStrictCapabilities not set)
const client = new Client(
{
name: 'test client',
version: '1.0'
},
{
capabilities: {}
}
);

await Promise.all([client.connect(clientTransport), server.connect(serverTransport)]);

// Server only supports tools
expect(client.getServerCapabilities()).toEqual({
tools: {}
});

// listTools should work and return actual tools
const toolsResult = await client.listTools();
expect(toolsResult.tools).toHaveLength(1);
expect(toolsResult.tools[0].name).toBe('test-tool');

// listPrompts should return empty list without sending request
const promptsResult = await client.listPrompts();
expect(promptsResult.prompts).toEqual([]);

// listResources should return empty list without sending request
const resourcesResult = await client.listResources();
expect(resourcesResult.resources).toEqual([]);

// listResourceTemplates should return empty list without sending request
const templatesResult = await client.listResourceTemplates();
expect(templatesResult.resourceTemplates).toEqual([]);
});

/***
* Test: Respect Client Notification Capabilities
*/
Expand DownExpand Up@@ -1885,7 +1958,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -1977,7 +2050,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -2270,7 +2343,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
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); } })(); })();
Skip to content
13 changes: 13 additions & 0 deletions .changeset/respect-capability-negotiation.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
---
'@modelcontextprotocol/client': patch
---

Respect capability negotiation in list methods by returning empty lists when server lacks capability

The Client now returns empty lists instead of sending requests to servers that don't advertise the corresponding capability:
- `listPrompts()` returns `{ prompts: [] }` if server lacks prompts capability
- `listResources()` returns `{ resources: [] }` if server lacks resources capability
- `listResourceTemplates()` returns `{ resourceTemplates: [] }` if server lacks resources capability
- `listTools()` returns `{ tools: [] }` if server lacks tools capability

This respects the MCP spec requirement that "Both parties SHOULD respect capability negotiation" and avoids unnecessary server warnings and traffic. The existing `enforceStrictCapabilities` option continues to throw errors when set to `true`.
24 changes: 24 additions & 0 deletions packages/client/src/client/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export class Client<
private _experimental?: { tasks: ExperimentalClientTasks<RequestT, NotificationT, ResultT> };
private _listChangedDebounceTimers: Map<string, ReturnType<typeof setTimeout>> = new Map();
private _pendingListChangedConfig?: ListChangedHandlers;
private _enforceStrictCapabilities: boolean;

/**
* Initializes this client with the given name and version information.
Expand All@@ -264,6 +265,7 @@ export class Client<
super(options);
this._capabilities = options?.capabilities ?? {};
this._jsonSchemaValidator = options?.jsonSchemaValidator ?? new AjvJsonSchemaValidator();
this._enforceStrictCapabilities = options?.enforceStrictCapabilities ?? false;

// Store list changed config for setup after connection (when we know server capabilities)
if (options?.listChanged) {
Expand DownExpand Up@@ -728,14 +730,31 @@ export class Client<
}

async listPrompts(params?: ListPromptsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.prompts && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support prompts
console.debug('Client.listPrompts() called but server does not advertise prompts capability - returning empty list');
return { prompts: [] };
}
return this.request({ method: 'prompts/list', params }, ListPromptsResultSchema, options);
}

async listResources(params?: ListResourcesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug('Client.listResources() called but server does not advertise resources capability - returning empty list');
return { resources: [] };
}
return this.request({ method: 'resources/list', params }, ListResourcesResultSchema, options);
}

async listResourceTemplates(params?: ListResourceTemplatesRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.resources && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support resources
console.debug(
'Client.listResourceTemplates() called but server does not advertise resources capability - returning empty list'
);
return { resourceTemplates: [] };
}
return this.request({ method: 'resources/templates/list', params }, ListResourceTemplatesResultSchema, options);
}

Expand DownExpand Up@@ -860,6 +879,11 @@ export class Client<
}

async listTools(params?: ListToolsRequest['params'], options?: RequestOptions) {
if (!this._serverCapabilities?.tools && !this._enforceStrictCapabilities) {
// Respect capability negotiation: server does not support tools
console.debug('Client.listTools() called but server does not advertise tools capability - returning empty list');
return { tools: [] };
}
const result = await this.request({ method: 'tools/list', params }, ListToolsResultSchema, options);

// Cache the tools and their output schemas for future validation
Expand Down
79 changes: 76 additions & 3 deletions test/integration/test/client/client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,79 @@ test('should respect server capabilities', async () => {
).rejects.toThrow('Server does not support completions');
});

/***
* Test: Return empty lists for missing capabilities (default behavior)
* When enforceStrictCapabilities is not set (default), list methods should
* return empty lists instead of sending requests to servers that don't
* advertise those capabilities.
*/
test('should return empty lists for missing capabilities by default', async () => {
const server = new Server(
{
name: 'test server',
version: '1.0'
},
{
capabilities: {
// Server only supports tools - no prompts or resources
tools: {}
}
}
);

server.setRequestHandler(InitializeRequestSchema, _request => ({
protocolVersion: LATEST_PROTOCOL_VERSION,
capabilities: {
tools: {}
},
serverInfo: {
name: 'test',
version: '1.0'
}
}));

server.setRequestHandler(ListToolsRequestSchema, () => ({
tools: [{ name: 'test-tool', inputSchema: { type: 'object' } }]
}));

const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();

// Client with default settings (enforceStrictCapabilities not set)
const client = new Client(
{
name: 'test client',
version: '1.0'
},
{
capabilities: {}
}
);

await Promise.all([client.connect(clientTransport), server.connect(serverTransport)]);

// Server only supports tools
expect(client.getServerCapabilities()).toEqual({
tools: {}
});

// listTools should work and return actual tools
const toolsResult = await client.listTools();
expect(toolsResult.tools).toHaveLength(1);
expect(toolsResult.tools[0].name).toBe('test-tool');

// listPrompts should return empty list without sending request
const promptsResult = await client.listPrompts();
expect(promptsResult.prompts).toEqual([]);

// listResources should return empty list without sending request
const resourcesResult = await client.listResources();
expect(resourcesResult.resources).toEqual([]);

// listResourceTemplates should return empty list without sending request
const templatesResult = await client.listResourceTemplates();
expect(templatesResult.resourceTemplates).toEqual([]);
});

/***
* Test: Respect Client Notification Capabilities
*/
Expand DownExpand Up@@ -1885,7 +1958,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -1977,7 +2050,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand DownExpand Up@@ -2270,7 +2343,7 @@ describe('outputSchema validation', () => {
// Set up server handlers
server.setRequestHandler(InitializeRequestSchema, async request => ({
protocolVersion: request.params.protocolVersion,
capabilities: {},
capabilities: { tools: {} },
serverInfo: {
name: 'test-server',
version: '1.0.0'
Expand Down
Loading