modelcontextprotocol/typescript-sdk
Watch
1
0
Fork
You've already forked typescript-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: correct error handling for unknown tools and resources (#1389)

Browse source 
Co-authored-by: Felix Weinberger <3823880+felixweinberger@users.noreply.github.com>
This commit is contained in:
Anthony 2026-03-09 19:17:09 +01:00 • committed by GitHub
commit 108f2f3ab6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 123 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/client/test/client/authExtensions.test.ts
View file

@ -305,7 +305,7 @@ describe('createPrivateKeyJwtAuth', () => {
const params = new URLSearchParams();
await expect(addClientAuth(new Headers(), params, 'https://auth.example.com/token', undefined)).rejects.toThrow(
/Invalid character/
/cannot be part of a valid base64|Invalid character/
);
});

1
packages/core/src/types/types.ts
View file

@ -233,6 +233,7 @@ export enum ProtocolErrorCode {
InternalError = -32_603,
// MCP-specific error codes
ResourceNotFound = -32_002,
UrlElicitationRequired = -32_042
}

18
packages/server/src/server/mcp.ts
View file

@ -166,15 +166,15 @@ export class McpServer {
);
this.server.setRequestHandler('tools/call', async (request, ctx): Promise<CallToolResult | CreateTaskResult> => {
try {
const tool = this._registeredTools[request.params.name];
if (!tool) {
throw new ProtocolError(ProtocolErrorCode.InvalidParams, `Tool ${request.params.name} not found`);
}
if (!tool.enabled) {
throw new ProtocolError(ProtocolErrorCode.InvalidParams, `Tool ${request.params.name} disabled`);
}
const tool = this._registeredTools[request.params.name];
if (!tool) {
throw new ProtocolError(ProtocolErrorCode.InvalidParams, `Tool ${request.params.name} not found`);
}
if (!tool.enabled) {
throw new ProtocolError(ProtocolErrorCode.InvalidParams, `Tool ${request.params.name} disabled`);
}
try {
const isTaskRequest = !!request.params.task;
const taskSupport = tool.execution?.taskSupport;
const isTaskHandler = 'createTask' in (tool.handler as AnyToolHandler<AnySchema>);
@ -506,7 +506,7 @@ export class McpServer {
}
}
throw new ProtocolError(ProtocolErrorCode.InvalidParams, `Resource ${uri} not found`);
throw new ProtocolError(ProtocolErrorCode.ResourceNotFound, `Resource ${uri} not found`);
});
this._resourceHandlersInitialized = true;