ruby-mcp-client 2.1.0 → 3.0.0

data/lib/mcp_client/server_streamable_http.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'request_meta_scope'
 require 'uri'
 require 'json'
 require 'monitor'
@@ -22,6 +23,10 @@ module MCPClient
     require_relative 'server_streamable_http/json_rpc_transport'
 
     include JsonRpcTransport
+    # Every operation that may weigh a cache decision runs inside a scope
+    # that reserves the host request_meta evaluation for the request it
+    # leads to, and drops it when the operation ends.
+    prepend MCPClient::RequestMetaScope
 
     # Default values for connection settings
     DEFAULT_READ_TIMEOUT = 30
@@ -143,6 +148,7 @@ module MCPClient
                                       })
 
       @read_timeout = opts[:read_timeout]
+      configure_protocol_mode(opts[:protocol], opts[:discover_timeout])
       @faraday_config = opts[:faraday_config]
       @max_decompressed_body_bytes = validate_decompression_limit(opts[:max_decompressed_body_bytes])
       @tools = nil
@@ -181,35 +187,39 @@ module MCPClient
     # @return [Boolean] true if connection was successful
     # @raise [MCPClient::Errors::ConnectionError] if connection fails
     def connect
-      return true if @mutex.synchronize { @connection_established }
+      # Serialized: concurrent first requests must not each run the probe
+      # and possibly settle on different eras (the monitor is reentrant, so
+      # the request plumbing inside may take @mutex again).
+      @mutex.synchronize do
+        return true if @connection_established
 
-      begin
-        @mutex.synchronize do
+        begin
           @connection_established = false
           @initialized = false
-        end
 
-        # Test connectivity with a simple HTTP request
-        test_connection
+          # Test connectivity with a simple HTTP request
+          test_connection
 
-        # Perform MCP initialization handshake
-        perform_initialize
+          # Establish the protocol era: server/discover for a modern server,
+          # the initialize handshake for a legacy one.
+          negotiate_protocol
 
-        # Start long-lived GET connection for server events
-        start_events_connection
+          # Long-lived GET stream for server events: legacy only. MCP
+          # 2026-07-28 removed the GET endpoint; change notifications arrive
+          # on subscriptions/listen streams instead.
+          start_events_connection unless modern?
 
-        @mutex.synchronize do
           @connection_established = true
           @initialized = true
-        end
 
-        true
-      rescue MCPClient::Errors::ConnectionError => e
-        cleanup
-        raise e
-      rescue StandardError => e
-        cleanup
-        raise MCPClient::Errors::ConnectionError, "Failed to connect to MCP server at #{@base_url}: #{e.message}"
+          true
+        rescue MCPClient::Errors::ConnectionError => e
+          cleanup
+          raise e
+        rescue StandardError => e
+          cleanup
+          raise MCPClient::Errors::ConnectionError, "Failed to connect to MCP server at #{@base_url}: #{e.message}"
+        end
       end
     end
 
@@ -219,21 +229,18 @@ module MCPClient
     # @raise [MCPClient::Errors::TransportError] if response isn't valid JSON
     # @raise [MCPClient::Errors::ToolCallError] for other errors during tool listing
     def list_tools
-      @mutex.synchronize do
-        return @tools if @tools
-      end
-
+      # MCP 2026-07-28 caching: a cached list is served only while fresh, and
+      # only from the entry that carries its hint.
+      cached = fresh_list_value(:tools) { @mutex.synchronize { @tools } }
+      return cached if cached
+
+      # Stale: the raw page cache must go too, or the re-fetch would be
+      # answered from memory.
+      @mutex.synchronize { @tools_data = nil }
       begin
         ensure_connected
 
-        tools_data = request_tools_list
-        @mutex.synchronize do
-          @tools = tools_data.map do |tool_data|
-            MCPClient::Tool.from_json(tool_data, server: self)
-          end
-        end
-
-        @mutex.synchronize { @tools }
+        refetch_or_serve_stale(:tools, stale_list_entry(:tools)) { fetch_tools_list }
       rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError, MCPClient::Errors::ServerError
         # Re-raise these errors directly
         raise
@@ -252,9 +259,15 @@ module MCPClient
     # @raise [MCPClient::Errors::ConnectionError] if server is disconnected
     def call_tool(tool_name, parameters)
       rpc_request('tools/call', build_named_request_params(tool_name, parameters))
-    rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError
+    rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError, MCPClient::Errors::ValidationError
       # Re-raise connection/transport errors directly to match test expectations
       raise
+    rescue MCPClient::Errors::ServerError => e
+      # 2026-07-28 protocol errors (typed -3202x, invalid result) carry
+      # actionable data such as requiredCapabilities; keep them intact.
+      raise if e.protocol_error?
+
+      raise MCPClient::Errors::ToolCallError, "Error calling tool '#{tool_name}': #{e.message}"
     rescue StandardError => e
       # For all other errors, wrap in ToolCallError
       raise MCPClient::Errors::ToolCallError, "Error calling tool '#{tool_name}': #{e.message}"
@@ -281,11 +294,17 @@ module MCPClient
       require_capability!('completions', method: 'completion/complete')
       params = { ref: ref, argument: argument }
       params[:context] = context if context
-      result = rpc_request('completion/complete', params)
+      result = require_complete_result!(rpc_request('completion/complete', params), 'completion/complete')
       result['completion'] || { 'values' => [] }
     rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError,
            MCPClient::Errors::CapabilityError
       raise
+    rescue MCPClient::Errors::ServerError => e
+      # 2026-07-28 protocol errors (typed -3202x, invalid result) carry
+      # actionable data such as requiredCapabilities; keep them intact.
+      raise if e.protocol_error?
+
+      raise MCPClient::Errors::ServerError, "Error requesting completion: #{e.message}"
     rescue StandardError => e
       raise MCPClient::Errors::ServerError, "Error requesting completion: #{e.message}"
     end
@@ -295,13 +314,31 @@ module MCPClient
     #   'critical', 'alert', 'emergency')
     # @return [Hash] empty result on success
     # @raise [MCPClient::Errors::ServerError] if server returns an error
+    # @deprecated Logging is deprecated since MCP 2026-07-28 (SEP-2577);
+    #   earliest removal is the first revision released on or after
+    #   2027-07-28. Have the server log to stderr (stdio) or use
+    #   OpenTelemetry instead.
     def log_level=(level)
+      MCPClient::Deprecations.warn(:logging, @logger)
       ensure_connected
+      # MCP 2026-07-28 removed logging/setLevel: the level travels per request
+      # in _meta["io.modelcontextprotocol/logLevel"].
+      if modern?
+        @log_level = validate_log_level!(level)
+        return
+      end
+
       require_capability!('logging', method: 'logging/setLevel')
       rpc_request('logging/setLevel', { level: level })
     rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError,
-           MCPClient::Errors::CapabilityError
+           MCPClient::Errors::CapabilityError, ArgumentError
       raise
+    rescue MCPClient::Errors::ServerError => e
+      # 2026-07-28 protocol errors (typed -3202x, invalid result) carry
+      # actionable data such as requiredCapabilities; keep them intact.
+      raise if e.protocol_error?
+
+      raise MCPClient::Errors::ServerError, "Error setting log level: #{e.message}"
     rescue StandardError => e
       raise MCPClient::Errors::ServerError, "Error setting log level: #{e.message}"
     end
@@ -310,29 +347,40 @@ module MCPClient
     # @return [Array<MCPClient::Prompt>] list of available prompts
     # @raise [MCPClient::Errors::PromptGetError] if prompts list retrieval fails
     def list_prompts
-      @mutex.synchronize do
-        return @prompts if @prompts
-      end
+      cached = fresh_list_value(:prompts) { @mutex.synchronize { @prompts } }
+      return cached if cached
 
+      @mutex.synchronize { @prompts_data = nil }
       begin
         ensure_connected
-
-        prompts_data = request_prompts_list
-        @mutex.synchronize do
-          @prompts = prompts_data.map do |prompt_data|
-            MCPClient::Prompt.from_json(prompt_data, server: self)
-          end
-        end
-
-        @mutex.synchronize { @prompts }
+        refetch_or_serve_stale(:prompts, stale_list_entry(:prompts)) { fetch_prompts_list }
       rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError, MCPClient::Errors::ServerError
-        # Re-raise these errors directly
         raise
       rescue StandardError => e
         raise MCPClient::Errors::PromptGetError, "Error listing prompts: #{e.message}"
       end
     end
 
+    # Fetch and cache the prompt list.
+    # @return [Array<MCPClient::Prompt>]
+    def fetch_prompts_list
+      ensure_connected
+
+      prompts = request_prompts_list.map { |prompt_data| MCPClient::Prompt.from_json(prompt_data, server: self) }
+      @mutex.synchronize do
+        @prompts = attach_list_value(:prompts, prompts) ? prompts : nil
+      end
+
+      # This request's own list, never a re-read of @prompts (another
+      # request may have stored its list in between).
+      prompts
+    rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError, MCPClient::Errors::ServerError
+      # Re-raise these errors directly
+      raise
+    rescue StandardError => e
+      raise MCPClient::Errors::PromptGetError, "Error listing prompts: #{e.message}"
+    end
+
     # Get a prompt with the given parameters
     # @param prompt_name [String] the name of the prompt to get
     # @param parameters [Hash] the parameters to pass to the prompt
@@ -343,6 +391,12 @@ module MCPClient
     rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError
       # Re-raise connection/transport errors directly
       raise
+    rescue MCPClient::Errors::ServerError => e
+      # 2026-07-28 protocol errors (typed -3202x, invalid result) carry
+      # actionable data such as requiredCapabilities; keep them intact.
+      raise if e.protocol_error?
+
+      raise MCPClient::Errors::PromptGetError, "Error getting prompt '#{prompt_name}': #{e.message}"
     rescue StandardError => e
       # For all other errors, wrap in PromptGetError
       raise MCPClient::Errors::PromptGetError, "Error getting prompt '#{prompt_name}': #{e.message}"
@@ -353,44 +407,69 @@ module MCPClient
     # @return [Hash] result containing resources array and optional nextCursor
     # @raise [MCPClient::Errors::ResourceReadError] if resources list retrieval fails
     def list_resources(cursor: nil)
-      @mutex.synchronize do
-        return @resources_result if @resources_result && !cursor
-      end
+      cached = cursor ? nil : fresh_list_value(:resources) { @mutex.synchronize { @resources_result } }
+      return cached if cached
 
       begin
         ensure_connected
-
-        params = {}
-        params['cursor'] = cursor if cursor
-        result = rpc_request('resources/list', params)
-
-        resources = (result['resources'] || []).map do |resource_data|
-          MCPClient::Resource.from_json(resource_data, server: self)
-        end
-
-        resources_result = { 'resources' => resources, 'nextCursor' => result['nextCursor'] }
-
-        @mutex.synchronize do
-          @resources_result = resources_result unless cursor
+        unless cursor
+          return refetch_or_serve_stale(:resources, stale_list_entry(:resources)) do
+            fetch_resources_list(nil)
+          end
         end
 
-        resources_result
+        fetch_resources_list(cursor)
       rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError, MCPClient::Errors::ServerError
-        # Re-raise these errors directly
         raise
       rescue StandardError => e
         raise MCPClient::Errors::ResourceReadError, "Error listing resources: #{e.message}"
       end
     end
 
+    # Fetch one page of resources/list, caching the first page.
+    # @param cursor [String, nil]
+    # @return [Hash]
+    def fetch_resources_list(cursor)
+      params = {}
+      params['cursor'] = cursor if cursor
+      epoch = cache_epoch(:resources)
+      answer = fetching_list_page(:resources, cursor) { rpc_request('resources/list', params) }
+      result = require_complete_result!(answer, 'resources/list')
+      record_cache_hint(:resources, result, epoch: epoch) unless cursor
+
+      resources = (result['resources'] || []).map do |resource_data|
+        MCPClient::Resource.from_json(resource_data, server: self)
+      end
+
+      resources_result = { 'resources' => resources, 'nextCursor' => result['nextCursor'] }
+
+      # A list invalidated while in flight is returned but not cached.
+      @mutex.synchronize do
+        unless cursor
+          @resources_result = attach_list_value(:resources, resources_result) ? resources_result : nil
+        end
+      end
+
+      resources_result
+    rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError, MCPClient::Errors::ServerError
+      # Re-raise these errors directly
+      raise
+    rescue StandardError => e
+      raise MCPClient::Errors::ResourceReadError, "Error listing resources: #{e.message}"
+    end
+
     # Read a resource by its URI
     # @param uri [String] the URI of the resource to read
     # @return [Array<MCPClient::ResourceContent>] array of resource contents
     # @raise [MCPClient::Errors::ResourceReadError] if resource reading fails
     def read_resource(uri)
-      result = rpc_request('resources/read', { uri: uri })
-      contents = result['contents'] || []
-      contents.map { |content| MCPClient::ResourceContent.from_json(content) }
+      ensure_connected
+      read_resource_with_cache(uri) { |sent| rpc_request('resources/read', { uri: sent }) }
+    rescue MCPClient::Errors::ServerError => e
+      raise if e.protocol_error?
+      raise resource_not_found_error(uri, e) if resource_not_found_response?(e)
+
+      raise MCPClient::Errors::ResourceReadError, "Error reading resource '#{uri}': #{e.message}"
     rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError
       # Re-raise connection/transport errors directly
       raise
@@ -404,19 +483,52 @@ module MCPClient
     # @return [Hash] result containing resourceTemplates array and optional nextCursor
     # @raise [MCPClient::Errors::ResourceReadError] for other errors during resource template listing
     def list_resource_templates(cursor: nil)
+      # Only a list the server itself bounded is served from here: a
+      # positive ttlMs means no second request, while a list with no hint
+      # (a 2025-11-25 server) is asked for again, as it was before this
+      # transport cached anything (MCP 2026-07-28 caching).
+      cached = cursor ? nil : hinted_list_value(:templates)
+      return cached if cached
+
+      begin
+        ensure_connected
+        unless cursor
+          return refetch_or_serve_stale(:templates, stale_list_entry(:templates)) do
+            fetch_templates_list(nil)
+          end
+        end
+
+        fetch_templates_list(cursor)
+      rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError, MCPClient::Errors::ServerError
+        raise
+      rescue StandardError => e
+        raise MCPClient::Errors::ResourceReadError, "Error listing resource templates: #{e.message}"
+      end
+    end
+
+    # Fetch one page of resources/templates/list, caching the first page.
+    # @param cursor [String, nil]
+    # @return [Hash]
+    def fetch_templates_list(cursor)
       params = {}
       params['cursor'] = cursor if cursor
-      result = rpc_request('resources/templates/list', params)
+      epoch = cache_epoch(:templates)
+      answer = fetching_list_page(:templates, cursor) { rpc_request('resources/templates/list', params) }
+      result = require_complete_result!(answer, 'resources/templates/list')
+      record_cache_hint(:templates, result, epoch: epoch) unless cursor
 
       templates = (result['resourceTemplates'] || []).map do |template_data|
         MCPClient::ResourceTemplate.from_json(template_data, server: self)
       end
+      templates_result = { 'resourceTemplates' => templates, 'nextCursor' => result['nextCursor'] }
 
-      { 'resourceTemplates' => templates, 'nextCursor' => result['nextCursor'] }
-    rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError, MCPClient::Errors::ServerError
-      raise
-    rescue StandardError => e
-      raise MCPClient::Errors::ResourceReadError, "Error listing resource templates: #{e.message}"
+      @mutex.synchronize do
+        unless cursor
+          @templates_result = attach_list_value(:templates, templates_result) ? templates_result : nil
+        end
+      end
+
+      templates_result
     end
 
     # Subscribe to resource updates
@@ -426,6 +538,13 @@ module MCPClient
     def subscribe_resource(uri)
       ensure_connected
       require_capability!('resources', 'subscribe', method: 'resources/subscribe')
+      # MCP 2026-07-28 replaced resources/subscribe with a subscriptions/listen
+      # stream carrying resourceSubscriptions.
+      if modern?
+        subscribe_resource_via_listen(uri)
+        return true
+      end
+
       rpc_request('resources/subscribe', { uri: uri })
       true
     rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError, MCPClient::Errors::ServerError,
@@ -442,6 +561,11 @@ module MCPClient
     def unsubscribe_resource(uri)
       ensure_connected
       require_capability!('resources', 'subscribe', method: 'resources/unsubscribe')
+      if modern?
+        unsubscribe_resource_via_listen(uri)
+        return true
+      end
+
       rpc_request('resources/unsubscribe', { uri: uri })
       true
     rescue MCPClient::Errors::ConnectionError, MCPClient::Errors::TransportError, MCPClient::Errors::ServerError,
@@ -455,6 +579,10 @@ module MCPClient
     def apply_request_headers(req, request)
       super
 
+      # Modern servers have no session; the base class added the 2026-07-28
+      # request metadata headers.
+      return if modern?
+
       # Add session and protocol version headers for non-initialize requests
       return unless request['method'] != 'initialize'
 
@@ -482,7 +610,7 @@ module MCPClient
       session_id = response.headers['mcp-session-id'] || response.headers['Mcp-Session-Id']
       if session_id
         if valid_session_id?(session_id)
-          @session_id = session_id
+          capture_session_id(session_id)
           @logger.debug("Captured session ID: #{@session_id}")
         else
           @logger.warn("Invalid session ID format received: #{session_id.inspect}")
@@ -505,6 +633,10 @@ module MCPClient
     # Clean up the server connection
     # Properly closes HTTP connections, stops threads, and clears cached state
     def cleanup
+      # Only an established session ends a task's namespace; a sessionless
+      # (MCP 2026-07-28) connection is merely closed, and a connection that
+      # never came up has nothing to end — see #ending_session?.
+      bump_session_epoch if ending_session?
       @mutex.synchronize do
         return unless @connection_established || @initialized
 
@@ -514,6 +646,9 @@ module MCPClient
         @connection_established = false
         @initialized = false
 
+        # Subscription streams (MCP 2026-07-28) end with the connection
+        close_listen_streams
+
         # Attempt to terminate session before cleanup
         begin
           terminate_session if @session_id
@@ -545,11 +680,27 @@ module MCPClient
         @prompts_data = nil
         @resources = nil
         @resources_data = nil
+        @resources_result = nil
+        @templates_result = nil
         @buffer = +''
         @buffer_scanned = 0
 
         @logger.info('Cleanup completed')
       end
+      # Cached results and their hints belong to the connection (and its
+      # authorization context) that was just torn down; outside @mutex, as
+      # the cache has its own lock.
+      clear_result_cache
+    ensure
+      # Everything this transport left on this thread — the notes of the
+      # entries it served and recorded, the credentials, parameters and
+      # metadata of its requests — describes a slice that will never be
+      # tagged and a request that will never be made. Dropped after the
+      # session was terminated, never before: the DELETE that terminates it
+      # is a request of this transport's own, and the recorder on its
+      # connection would put its Authorization fingerprint straight back on
+      # this thread.
+      forget_transport_thread_state
     end
 
     # Register a callback for elicitation requests (MCP 2025-06-18)
@@ -560,6 +711,13 @@ module MCPClient
     end
 
     # Register a callback for roots/list requests (MCP 2025-06-18)
+    #
+    # @deprecated Roots is deprecated since MCP 2026-07-28 (SEP-2577); earliest
+    #   removal is the first revision released on or after 2027-07-28. Registering
+    #   a handler is not itself use of Roots — a handler that answers with no root
+    #   exposes nothing deprecated — but a handler that answers with a root adopts
+    #   the deprecated feature and raises the notice. Pass directories or files
+    #   through tool parameters, resource URIs or server configuration instead.
     # @param block [Proc] callback that receives (request_id, params) and returns response hash
     # @return [void]
     def on_roots_list_request(&block)
@@ -567,6 +725,11 @@ module MCPClient
     end
 
     # Register a callback for sampling requests (MCP 2025-11-25)
+    #
+    # @deprecated Sampling is deprecated since MCP 2026-07-28 (SEP-2577); earliest
+    #   removal is the first revision released on or after 2027-07-28. Integrate
+    #   directly with the LLM provider API instead of serving
+    #   sampling/createMessage.
     # @param block [Proc] callback that receives (request_id, params) and returns response hash
     # @return [void]
     def on_sampling_request(&block)
@@ -610,7 +773,9 @@ module MCPClient
         logger: nil,
         oauth_provider: nil,
         faraday_config: nil,
-        max_decompressed_body_bytes: JsonRpcTransport::MAX_DECOMPRESSED_BODY_BYTES
+        max_decompressed_body_bytes: JsonRpcTransport::MAX_DECOMPRESSED_BODY_BYTES,
+        protocol: :auto,
+        discover_timeout: nil
       }
     end
 
@@ -635,65 +800,50 @@ module MCPClient
     # @return [void]
     # @raise [MCPClient::Errors::ConnectionError] if connection is not established
     def ensure_connected
-      return if @mutex.synchronize { @connection_established && @initialized }
+      # Serialized on the transport monitor (reentrant, so the nested
+      # cleanup/connect may take it again): checking the flags and acting on
+      # them must be one step. Otherwise a caller that observed "disconnected"
+      # can be overtaken by one that reconnects, and then tear that fresh
+      # connection down — terminating its session and re-running the era
+      # probe.
+      @mutex.synchronize do
+        return if @connection_established && @initialized
 
-      @logger.debug('Connection not active, attempting to reconnect before request')
-      cleanup
-      connect
+        @logger.debug('Connection not active, attempting to reconnect before request')
+        cleanup
+        connect
+      end
     end
 
     # Request the tools list using JSON-RPC
     # @return [Array<Hash>] the tools data
     # @raise [MCPClient::Errors::ToolCallError] if tools list retrieval fails
     def request_tools_list
-      @mutex.synchronize do
-        return @tools_data.dup if @tools_data
-      end
-
       # Follow nextCursor across pages so the full tool list is returned even
-      # when the server paginates.
-      tools = request_paginated_list('tools/list', 'tools')
-
-      @mutex.synchronize { @tools_data = tools }
-      @mutex.synchronize { @tools_data.dup }
+      # when the server paginates. The raw pages are this fetch's own: a
+      # shared copy could answer a concurrent caller under other
+      # credentials with a privately scoped list (MCP 2026-07-28 caching).
+      request_paginated_list('tools/list', 'tools')
     end
 
     # Request the prompts list using JSON-RPC
     # @return [Array<Hash>] the prompts data
     # @raise [MCPClient::Errors::PromptGetError] if prompts list retrieval fails
     def request_prompts_list
-      @mutex.synchronize do
-        return @prompts_data.dup if @prompts_data
-      end
-
-      # Follow nextCursor across pages so the full prompt list is returned.
-      prompts = request_paginated_list('prompts/list', 'prompts')
-
-      @mutex.synchronize { @prompts_data = prompts }
-      @mutex.synchronize { @prompts_data.dup }
+      # Follow nextCursor across pages so the full prompt list is returned;
+      # the raw pages are this fetch's own (see request_tools_list).
+      request_paginated_list('prompts/list', 'prompts')
     end
 
     # Request the resources list using JSON-RPC
     # @return [Array<Hash>] the resources data
     # @raise [MCPClient::Errors::ResourceReadError] if resources list retrieval fails
     def request_resources_list
-      @mutex.synchronize do
-        return @resources_data if @resources_data
-      end
-
+      # The raw list is this fetch's own (see request_tools_list).
       result = rpc_request('resources/list')
 
-      if result.is_a?(Hash) && result['resources']
-        @mutex.synchronize do
-          @resources_data = result['resources']
-        end
-        return @mutex.synchronize { @resources_data.dup }
-      elsif result.is_a?(Array) || result
-        @mutex.synchronize do
-          @resources_data = result
-        end
-        return @mutex.synchronize { @resources_data.dup }
-      end
+      return result['resources'].dup if result.is_a?(Hash) && result['resources']
+      return result.dup if result.is_a?(Array) || result
 
       raise MCPClient::Errors::ResourceReadError, 'Failed to get resources list from JSON-RPC request'
     end
@@ -962,6 +1112,7 @@ module MCPClient
       req.headers['Mcp-Protocol-Version'] = @protocol_version if @protocol_version
       # MCP: authorization MUST be included in every HTTP request
       @oauth_provider&.apply_authorization(req)
+      note_request_authorization(req.headers['Authorization'])
       # SEP-1699: resumption is via GET with the Last-Event-ID cursor, so the
       # server can replay messages missed since the last received event.
       last_event_id = @mutex.synchronize { @last_event_id }
@@ -1110,6 +1261,29 @@ module MCPClient
     # interleaved on a POST SSE response stream.
     # @param message [Hash] the parsed JSON-RPC message
     def dispatch_server_message(message)
+      # Host code reached from here -- a notification listener, a handler for
+      # a server-initiated request -- may issue a request of its own while the
+      # response that carried this message is still being parsed. That request
+      # is an exchange of its own, and the call still waiting for this response
+      # must keep both its recorded definition and its own failures
+      # (HttpTransportBase::RequestRecovery#dispatching_to_host).
+      dispatching_to_host { dispatch_server_message_now(message) }
+    end
+
+    # @param message [Hash] the parsed JSON-RPC message
+    def dispatch_server_message_now(message)
+      if protocol_era == :modern && message['method'] && message.key?('id')
+        # MCP 2026-07-28: "The server MUST NOT send independent JSON-RPC
+        # requests on this stream" — server-to-client interactions are
+        # embedded in InputRequiredResult. There is no response channel
+        # either (clients MUST NOT POST responses), so the request is dropped.
+        # Judged by the ESTABLISHED era: while the probe is in flight a legacy
+        # server may be waiting for its ping on the probe's own stream.
+        @logger.warn("Ignoring server-initiated request #{message['method']} on a response stream: " \
+                     'not permitted by MCP 2026-07-28')
+        return
+      end
+
       # Handle ping requests from server (keepalive mechanism)
       if message['method'] == 'ping' && message.key?('id')
         handle_ping_request(message['id'])
@@ -1118,7 +1292,7 @@ module MCPClient
         handle_server_request(message)
       elsif message['method'] && !message.key?('id')
         # Handle server notifications (messages without id)
-        @notification_callback&.call(message['method'], message['params'])
+        route_notification(message['method'], message['params'])
       elsif message.key?('id')
         # A response replayed on the events stream after its POST stream was
         # closed before delivery (SEP-1699 resumption)
@@ -1204,6 +1378,10 @@ module MCPClient
 
       # Call the registered callback
       result = @roots_list_request_callback.call(request_id, params)
+      # Serving a roots/list answer that carries a root means this host
+      # declared, and is using, the deprecated Roots capability (SEP-2577) —
+      # with or without a Client. An empty answer is not use of it.
+      warn_roots_deprecated(result)
 
       # Send the response back to the server (echoing related-task _meta)
       send_roots_list_response(request_id, merge_related_task_meta(result, params))
@@ -1217,10 +1395,18 @@ module MCPClient
       # If no callback is registered, return error
       unless @sampling_request_callback
         @logger.warn('Received sampling request but no callback registered, returning error')
-        send_error_response(request_id, -1, 'Sampling not supported')
+        # sampling.mdx § Error Handling reserves -1 for "User rejected sampling
+        # request"; a capability this client never declared is an unsupported
+        # method (-32601, Method not found), as Client#handle_sampling_request answers.
+        send_error_response(request_id, -32_601, 'Sampling not supported')
         return
       end
 
+      # Sampling, and the includeContext values it may carry, are deprecated
+      # (SEP-2577, SEP-2596) — with or without a Client.
+      warn_sampling_deprecated(params)
+      return if refused_undeclared_sampling_tools?(request_id, params)
+
       # Call the registered callback
       result = @sampling_request_callback.call(request_id, params)
 
@@ -1356,6 +1542,7 @@ module MCPClient
           req.headers['Mcp-Protocol-Version'] = @protocol_version if @protocol_version
           # MCP: authorization MUST be included in every HTTP request
           @oauth_provider&.apply_authorization(req)
+          note_request_authorization(req.headers['Authorization'])
           req.body = json_body
         end