From b868c463deb0c772710032f28c06a11ed48ac288 Mon Sep 17 00:00:00 2001
From: Mikhail Dubov <mikhail@chattermill.io>
Date: Wed, 28 Jan 2026 17:08:36 +0000
Subject: [PATCH] client_info -> client

---
 lib/mcp/instrumentation.rb | 4 ++++
 lib/mcp/server.rb          | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/mcp/instrumentation.rb b/lib/mcp/instrumentation.rb
index 40975a91..618f8661 100644
--- a/lib/mcp/instrumentation.rb
+++ b/lib/mcp/instrumentation.rb
@@ -8,6 +8,10 @@ def instrument_call(method, &block)
         @instrumentation_data = {}
         add_instrumentation_data(method: method)
 
+        if respond_to?(:client) && client
+          add_instrumentation_data(client: client)
+        end
+
         result = yield block
 
         result
diff --git a/lib/mcp/server.rb b/lib/mcp/server.rb
index adf7817d..7d4657ac 100644
--- a/lib/mcp/server.rb
+++ b/lib/mcp/server.rb
@@ -40,7 +40,7 @@ def initialize(method_name)
 
     include Instrumentation
 
-    attr_accessor :description, :icons, :name, :title, :version, :website_url, :instructions, :tools, :prompts, :resources, :server_context, :configuration, :capabilities, :transport
+    attr_accessor :description, :icons, :name, :title, :version, :website_url, :instructions, :tools, :prompts, :resources, :server_context, :configuration, :capabilities, :transport, :client
 
     def initialize(
       description: nil,
@@ -74,6 +74,7 @@ def initialize(
       @resource_index = index_resources_by_uri(resources)
       @server_context = server_context
       @configuration = MCP.configuration.merge(configuration)
+      @client = nil
 
       validate!
 
@@ -299,6 +300,7 @@ def server_info
     end
 
     def init(request)
+      @client = request[:clientInfo] || request["clientInfo"] if request
       {
         protocolVersion: configuration.protocol_version,
         capabilities: capabilities,