Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions lib/mcp/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -531,14 +531,14 @@ def call_prompt_template_with_args(prompt, args, server_context)

def server_context_with_meta(request)
meta = request[:_meta]
if meta && @server_context.is_a?(Hash)
context = @server_context.dup
if meta && server_context.is_a?(Hash)
context = server_context.dup
context[:_meta] = meta
context
elsif meta && @server_context.nil?
elsif meta && server_context.nil?
{ _meta: meta }
else
@server_context
server_context
end
end
end
Expand Down
26 changes: 26 additions & 0 deletions test/mcp/server_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1731,5 +1731,31 @@ def call(numbers:, strings:, objects:, server_context: nil)
end
end
end

test "server_context_with_meta uses accessor method, not ivar directly" do
subclass = Class.new(Server) do
def server_context
{ custom: "from_accessor" }
end
end

server = subclass.new(name: "test", tools: [])

received_context = nil
server.define_tool(name: "ctx_tool") do |server_context:|
received_context = server_context
Tool::Response.new([{ type: "text", text: "ok" }])
end

request = {
jsonrpc: "2.0",
method: "tools/call",
id: 1,
params: { name: "ctx_tool", arguments: {} },
}

server.handle(request)
assert_equal "from_accessor", received_context[:custom]
end
end
end