## Motivation and Context This commit implements Phase 1 of 3 for #334. The MCP specification requires an `initialize` request followed by a `notifications/initialized` notification before any other interaction. PR #327 added `MCP::Client#connect` and `MCP::Client::HTTP#connect` to expose this handshake explicitly for the HTTP transport, but stdio remained on its private `initialize_session` lazy-init path, inconsistent with the Python SDK (`ClientSession.initialize()`) and TypeScript SDK (`Client.connect(transport)`), both of which require an explicit handshake call regardless of transport. The implicit init path on the first `send_request` is preserved as a non-breaking compatibility shim. Public API added on `Stdio`: - `connect(client_info:, protocol_version:, capabilities:)` performs the handshake, validates the negotiated `protocolVersion` against `MCP::Configuration::SUPPORTED_STABLE_PROTOCOL_VERSIONS`, caches the `InitializeResult`, and is idempotent. - `connected?` reports handshake completion. - `server_info` exposes the cached `InitializeResult`. Documentation and examples are updated so new users learn the explicit pattern from the start. ## How Has This Been Tested? Fifteen regression tests cover: explicit handshake, `server_info` caching, idempotence, custom keyword arguments, JSON-RPC error response, missing or non-Hash `result`, unsupported protocol version with state rollback, state rollback when the `notifications/initialized` write fails, retry after a failed handshake, and the `connected?` / `server_info` lifecycle. The pre-existing stdio tests pass without modification, verifying that the implicit-init compatibility path still works. ## Breaking Changes None for the typical "implicit init via `client.tools` / `client.call_tool`" usage. Existing stdio clients keep working unchanged. Three observable behavior changes for code that inspects transport state directly: - `Client#connected?` for a never-initialized stdio client returns `false` (previously fell through to a `true` default via the `respond_to?` fallback). - `Client#server_info` for stdio returns the cached `InitializeResult` after the handshake (previously always `nil` via the fallback). - The implicit handshake path now validates the server's negotiated protocol version, raising `RequestHandlerError` for unsupported versions. Production servers that return one of the supported versions are unaffected; this closes a pre-existing spec-conformance gap on stdio.
273 lines
8.7 KiB
Ruby
273 lines
8.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "json"
|
|
require "open3"
|
|
require "securerandom"
|
|
require "timeout"
|
|
require_relative "../../json_rpc_handler"
|
|
require_relative "../configuration"
|
|
require_relative "../methods"
|
|
require_relative "../version"
|
|
|
|
module MCP
|
|
class Client
|
|
class Stdio
|
|
# Seconds to wait for the server process to exit before sending SIGTERM.
|
|
# Matches the Python and TypeScript SDKs' shutdown timeout:
|
|
# https://github.com/modelcontextprotocol/python-sdk/blob/v1.26.0/src/mcp/client/stdio/__init__.py#L48
|
|
# https://github.com/modelcontextprotocol/typescript-sdk/blob/v1.27.1/src/client/stdio.ts#L221
|
|
CLOSE_TIMEOUT = 2
|
|
STDERR_READ_SIZE = 4096
|
|
|
|
attr_reader :command, :args, :env, :server_info
|
|
|
|
def initialize(command:, args: [], env: nil, read_timeout: nil)
|
|
@command = command
|
|
@args = args
|
|
@env = env
|
|
@read_timeout = read_timeout
|
|
@stdin = nil
|
|
@stdout = nil
|
|
@stderr = nil
|
|
@wait_thread = nil
|
|
@stderr_thread = nil
|
|
@started = false
|
|
@initialized = false
|
|
@server_info = nil
|
|
end
|
|
|
|
# Performs the MCP `initialize` handshake: sends an `initialize` request
|
|
# followed by the required `notifications/initialized` notification. The
|
|
# server's `InitializeResult` (protocol version, capabilities, server
|
|
# info, instructions) is cached on the transport and returned.
|
|
#
|
|
# Idempotent: a second call returns the cached `InitializeResult` without
|
|
# contacting the server. After `close`, state is cleared and `connect`
|
|
# will handshake again. Spawns the subprocess via `start` if it has not
|
|
# been started yet.
|
|
#
|
|
# @param client_info [Hash, nil] `{ name:, version: }` identifying the client.
|
|
# Defaults to `{ name: "mcp-ruby-client", version: MCP::VERSION }`.
|
|
# @param protocol_version [String, nil] Protocol version to offer. Defaults
|
|
# to `MCP::Configuration::LATEST_STABLE_PROTOCOL_VERSION`.
|
|
# @param capabilities [Hash] Capabilities advertised by the client. Defaults to `{}`.
|
|
# @return [Hash] The server's `InitializeResult`.
|
|
# @raise [RequestHandlerError] If the server responds with a JSON-RPC error,
|
|
# a malformed result, or an unsupported protocol version.
|
|
# https://modelcontextprotocol.io/specification/2025-11-25/basic/lifecycle#initialization
|
|
def connect(client_info: nil, protocol_version: nil, capabilities: {})
|
|
return @server_info if @initialized
|
|
|
|
start unless @started
|
|
|
|
client_info ||= { name: "mcp-ruby-client", version: MCP::VERSION }
|
|
protocol_version ||= MCP::Configuration::LATEST_STABLE_PROTOCOL_VERSION
|
|
|
|
init_request = {
|
|
jsonrpc: JsonRpcHandler::Version::V2_0,
|
|
id: SecureRandom.uuid,
|
|
method: MCP::Methods::INITIALIZE,
|
|
params: {
|
|
protocolVersion: protocol_version,
|
|
capabilities: capabilities,
|
|
clientInfo: client_info,
|
|
},
|
|
}
|
|
|
|
write_message(init_request)
|
|
response = read_response(init_request)
|
|
|
|
if response.key?("error")
|
|
error = response["error"]
|
|
raise RequestHandlerError.new(
|
|
"Server initialization failed: #{error["message"]}",
|
|
{ method: MCP::Methods::INITIALIZE },
|
|
error_type: :internal_error,
|
|
)
|
|
end
|
|
|
|
unless response["result"].is_a?(Hash)
|
|
raise RequestHandlerError.new(
|
|
"Server initialization failed: missing result in response",
|
|
{ method: MCP::Methods::INITIALIZE },
|
|
error_type: :internal_error,
|
|
)
|
|
end
|
|
|
|
@server_info = response["result"]
|
|
|
|
negotiated_protocol_version = @server_info["protocolVersion"]
|
|
unless MCP::Configuration::SUPPORTED_STABLE_PROTOCOL_VERSIONS.include?(negotiated_protocol_version)
|
|
# Per spec, if the client does not support the server's returned protocol version,
|
|
# the client SHOULD disconnect. Roll back the cached `InitializeResult` before
|
|
# raising so a retry starts without a stale `server_info`.
|
|
# https://modelcontextprotocol.io/specification/2025-11-25/basic/lifecycle#version-negotiation
|
|
@server_info = nil
|
|
raise RequestHandlerError.new(
|
|
"Server initialization failed: unsupported protocol version #{negotiated_protocol_version.inspect}",
|
|
{ method: MCP::Methods::INITIALIZE },
|
|
error_type: :internal_error,
|
|
)
|
|
end
|
|
|
|
begin
|
|
notification = {
|
|
jsonrpc: JsonRpcHandler::Version::V2_0,
|
|
method: MCP::Methods::NOTIFICATIONS_INITIALIZED,
|
|
}
|
|
write_message(notification)
|
|
rescue StandardError
|
|
@server_info = nil
|
|
raise
|
|
end
|
|
|
|
@initialized = true
|
|
@server_info
|
|
end
|
|
|
|
# Returns true once `connect` (or the implicit handshake on the first
|
|
# `send_request`) has completed. Returns false before the handshake
|
|
# and after `close`.
|
|
def connected?
|
|
@initialized
|
|
end
|
|
|
|
def send_request(request:)
|
|
start unless @started
|
|
connect unless @initialized
|
|
|
|
write_message(request)
|
|
read_response(request)
|
|
end
|
|
|
|
def start
|
|
raise "MCP::Client::Stdio already started" if @started
|
|
|
|
spawn_env = @env || {}
|
|
@stdin, @stdout, @stderr, @wait_thread = Open3.popen3(spawn_env, @command, *@args)
|
|
@stdout.set_encoding("UTF-8")
|
|
@stdin.set_encoding("UTF-8")
|
|
|
|
# Drain stderr in the background to prevent the pipe buffer from filling up,
|
|
# which would cause the server process to block and deadlock.
|
|
@stderr_thread = Thread.new do
|
|
loop do
|
|
@stderr.readpartial(STDERR_READ_SIZE)
|
|
end
|
|
rescue IOError
|
|
nil
|
|
end
|
|
|
|
@started = true
|
|
rescue Errno::ENOENT, Errno::EACCES, Errno::ENOEXEC => e
|
|
raise RequestHandlerError.new(
|
|
"Failed to spawn server process: #{e.message}",
|
|
{},
|
|
error_type: :internal_error,
|
|
original_error: e,
|
|
)
|
|
end
|
|
|
|
def close
|
|
return unless @started
|
|
|
|
@stdin.close
|
|
@stdout.close
|
|
@stderr.close
|
|
|
|
begin
|
|
Timeout.timeout(CLOSE_TIMEOUT) { @wait_thread.value }
|
|
rescue Timeout::Error
|
|
begin
|
|
Process.kill("TERM", @wait_thread.pid)
|
|
Timeout.timeout(CLOSE_TIMEOUT) { @wait_thread.value }
|
|
rescue Timeout::Error
|
|
begin
|
|
Process.kill("KILL", @wait_thread.pid)
|
|
rescue Errno::ESRCH
|
|
nil
|
|
end
|
|
rescue Errno::ESRCH
|
|
nil
|
|
end
|
|
end
|
|
|
|
@stderr_thread.join(CLOSE_TIMEOUT)
|
|
@started = false
|
|
@initialized = false
|
|
@server_info = nil
|
|
end
|
|
|
|
private
|
|
|
|
def write_message(message)
|
|
ensure_running!
|
|
json = JSON.generate(message)
|
|
@stdin.puts(json)
|
|
@stdin.flush
|
|
rescue IOError, Errno::EPIPE => e
|
|
raise RequestHandlerError.new(
|
|
"Failed to write to server process",
|
|
{},
|
|
error_type: :internal_error,
|
|
original_error: e,
|
|
)
|
|
end
|
|
|
|
def read_response(request)
|
|
request_id = request[:id] || request["id"]
|
|
method = request[:method] || request["method"]
|
|
params = request[:params] || request["params"]
|
|
|
|
loop do
|
|
ensure_running!
|
|
wait_for_readable!(method, params) if @read_timeout
|
|
line = @stdout.gets
|
|
raise_connection_error!(method, params) if line.nil?
|
|
|
|
parsed = JSON.parse(line.strip)
|
|
|
|
next unless parsed.key?("id")
|
|
|
|
return parsed if parsed["id"] == request_id
|
|
end
|
|
rescue JSON::ParserError => e
|
|
raise RequestHandlerError.new(
|
|
"Failed to parse server response",
|
|
{ method: method, params: params },
|
|
error_type: :internal_error,
|
|
original_error: e,
|
|
)
|
|
end
|
|
|
|
def ensure_running!
|
|
return if @wait_thread.alive?
|
|
|
|
raise RequestHandlerError.new(
|
|
"Server process has exited",
|
|
{},
|
|
error_type: :internal_error,
|
|
)
|
|
end
|
|
|
|
def wait_for_readable!(method, params)
|
|
ready = @stdout.wait_readable(@read_timeout)
|
|
return if ready
|
|
|
|
raise RequestHandlerError.new(
|
|
"Timed out waiting for server response",
|
|
{ method: method, params: params },
|
|
error_type: :internal_error,
|
|
)
|
|
end
|
|
|
|
def raise_connection_error!(method, params)
|
|
raise RequestHandlerError.new(
|
|
"Server process closed stdout unexpectedly",
|
|
{ method: method, params: params },
|
|
error_type: :internal_error,
|
|
)
|
|
end
|
|
end
|
|
end
|
|
end
|