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

Merge pull request #231 from koic/return_json_rpc_protocol_errors_for_unknown_tool_calls

Browse source 
Return JSON-RPC protocol errors for unknown tool calls
This commit is contained in:
Koichi ITO 2026-02-20 11:51:16 +09:00 • committed by GitHub
commit c8a68da37b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/mcp/server.rb
View file

@ -377,7 +377,7 @@ module MCP
unless tool unless tool
add_instrumentation_data(tool_name: tool_name, error: :tool_not_found) add_instrumentation_data(tool_name: tool_name, error: :tool_not_found)
return error_tool_response("Tool not found: #{tool_name}") raise RequestHandlerError.new("Tool not found: #{tool_name}", request, error_type: :invalid_params)
end end
arguments = request[:arguments] || {} arguments = request[:arguments] || {}
@ -401,6 +401,8 @@ module MCP
end end
call_tool_with_args(tool, arguments) call_tool_with_args(tool, arguments)
rescue RequestHandlerError
raise
rescue => e rescue => e
report_exception(e, request: request) report_exception(e, request: request)

22
test/mcp/server_test.rb
View file

@ -527,7 +527,7 @@ module MCP
assert_match(/Internal error calling tool tool_with_faulty_schema: Unexpected schema error/, response[:result][:content][0][:text]) assert_match(/Internal error calling tool tool_with_faulty_schema: Unexpected schema error/, response[:result][:content][0][:text])
end end
test "#handle tools/call returns error response with isError true for unknown tool" do test "#handle tools/call returns JSON-RPC error for unknown tool" do
request = { request = {
jsonrpc: "2.0", jsonrpc: "2.0",
method: "tools/call", method: "tools/call",
@ -539,14 +539,14 @@ module MCP
} }
response = @server.handle(request) response = @server.handle(request)
assert_nil response[:error], "Expected no JSON-RPC error" assert_nil response[:result]
assert response[:result][:isError] assert_equal(-32602, response[:error][:code])
assert_equal "text", response[:result][:content][0][:type] assert_equal "Invalid params", response[:error][:message]
assert_equal "Tool not found: unknown_tool", response[:result][:content][0][:text] assert_includes response[:error][:data], "Tool not found: unknown_tool"
assert_instrumentation_data({ method: "tools/call", tool_name: "unknown_tool", error: :tool_not_found }) assert_instrumentation_data({ method: "tools/call", tool_name: "unknown_tool", error: :invalid_params })
end end
test "#handle_json returns error response with isError true for unknown tool" do test "#handle_json returns JSON-RPC error for unknown tool" do
request = JSON.generate({ request = JSON.generate({
jsonrpc: "2.0", jsonrpc: "2.0",
method: "tools/call", method: "tools/call",
@ -558,10 +558,10 @@ module MCP
}) })
response = JSON.parse(@server.handle_json(request), symbolize_names: true) response = JSON.parse(@server.handle_json(request), symbolize_names: true)
assert_nil response[:error], "Expected no JSON-RPC error" assert_nil response[:result]
assert response[:result][:isError] assert_equal(-32602, response[:error][:code])
assert_equal "text", response[:result][:content][0][:type] assert_equal "Invalid params", response[:error][:message]
assert_equal "Tool not found: unknown_tool", response[:result][:content][0][:text] assert_includes response[:error][:data], "Tool not found: unknown_tool"
end end
test "#tools_call_handler sets the tools/call handler" do test "#tools_call_handler sets the tools/call handler" do