mcp 0.7.1 → 0.9.0

data/lib/mcp/server/transports/streamable_http_transport.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "../../transport"
 require "json"
 require "securerandom"
+require_relative "../../transport"
 
 module MCP
   class Server
@@ -19,6 +19,7 @@ module MCP
 
         REQUIRED_POST_ACCEPT_TYPES = ["application/json", "text/event-stream"].freeze
         REQUIRED_GET_ACCEPT_TYPES = ["text/event-stream"].freeze
+        STREAM_WRITE_ERRORS = [IOError, Errno::EPIPE, Errno::ECONNRESET].freeze
 
         def handle_request(request)
           case request.env["REQUEST_METHOD"]
@@ -58,7 +59,7 @@ module MCP
               begin
                 send_to_stream(session[:stream], notification)
                 true
-              rescue IOError, Errno::EPIPE => e
+              rescue *STREAM_WRITE_ERRORS => e
                 MCP.configuration.exception_reporter.call(
                   e,
                   { session_id: session_id, error: "Failed to send notification" },
@@ -77,7 +78,7 @@ module MCP
                 begin
                   send_to_stream(session[:stream], notification)
                   sent_count += 1
-                rescue IOError, Errno::EPIPE => e
+                rescue *STREAM_WRITE_ERRORS => e
                   MCP.configuration.exception_reporter.call(
                     e,
                     { session_id: sid, error: "Failed to send notification" },
@@ -153,13 +154,7 @@ module MCP
             return success_response
           end
 
-          session_id = request.env["HTTP_MCP_SESSION_ID"]
-
-          return [
-            400,
-            { "Content-Type" => "application/json" },
-            [{ error: "Missing session ID" }.to_json],
-          ] unless session_id
+          return missing_session_id_response unless (session_id = request.env["HTTP_MCP_SESSION_ID"])
 
           cleanup_session(session_id)
           success_response
@@ -192,6 +187,8 @@ module MCP
           return not_acceptable_response(required_types) unless accept_header
 
           accepted_types = parse_accept_header(accept_header)
+          return if accepted_types.include?("*/*")
+
           missing_types = required_types - accepted_types
           return not_acceptable_response(required_types) unless missing_types.empty?
 
@@ -256,31 +253,23 @@ module MCP
 
         def handle_regular_request(body_string, session_id)
           unless @stateless
-            # If session ID is provided, but not in the sessions hash, return an error
-            if session_id && !@sessions.key?(session_id)
-              return [400, { "Content-Type" => "application/json" }, [{ error: "Invalid session ID" }.to_json]]
+            if session_id && !session_exists?(session_id)
+              return session_not_found_response
             end
           end
 
-          response = @server.handle_json(body_string) || ""
+          response = @server.handle_json(body_string)
 
           # Stream can be nil since stateless mode doesn't retain streams
           stream = get_session_stream(session_id) if session_id
 
           if stream
             send_response_to_stream(stream, response, session_id)
-          elsif response.nil? && notification_request?(body_string)
-            [202, { "Content-Type" => "application/json" }, [response]]
           else
             [200, { "Content-Type" => "application/json" }, [response]]
           end
         end
 
-        def notification_request?(body_string)
-          body = parse_request_body(body_string)
-          body.is_a?(Hash) && body["method"].start_with?("notifications/")
-        end
-
         def get_session_stream(session_id)
           @mutex.synchronize { @sessions[session_id]&.fetch(:stream, nil) }
         end
@@ -288,8 +277,8 @@ module MCP
         def send_response_to_stream(stream, response, session_id)
           message = JSON.parse(response)
           send_to_stream(stream, message)
-          [200, { "Content-Type" => "application/json" }, [{ accepted: true }.to_json]]
-        rescue IOError, Errno::EPIPE => e
+          handle_accepted
+        rescue *STREAM_WRITE_ERRORS => e
           MCP.configuration.exception_reporter.call(
             e,
             { session_id: session_id, error: "Stream closed during response" },
@@ -366,7 +355,7 @@ module MCP
               send_ping_to_stream(@sessions[session_id][:stream])
             end
           end
-        rescue IOError, Errno::EPIPE => e
+        rescue *STREAM_WRITE_ERRORS => e
           MCP.configuration.exception_reporter.call(
             e,
             { session_id: session_id, error: "Stream closed" },

data/lib/mcp/server/transports.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module MCP
+  class Server
+    module Transports
+      autoload :StdioTransport, "mcp/server/transports/stdio_transport"
+      autoload :StreamableHTTPTransport, "mcp/server/transports/streamable_http_transport"
+    end
+  end
+end

data/lib/mcp/server.rb

@@ -4,6 +4,9 @@ require_relative "../json_rpc_handler"
 require_relative "instrumentation"
 require_relative "methods"
 require_relative "logging_message_notification"
+require_relative "progress"
+require_relative "server_context"
+require_relative "server/transports"
 
 module MCP
   class ToolNotUnique < StandardError
@@ -96,12 +99,13 @@ module MCP
         Methods::INITIALIZE => method(:init),
         Methods::PING => ->(_) { {} },
         Methods::NOTIFICATIONS_INITIALIZED => ->(_) {},
+        Methods::NOTIFICATIONS_PROGRESS => ->(_) {},
         Methods::LOGGING_SET_LEVEL => method(:configure_logging_level),
 
         # No op handlers for currently unsupported methods
-        Methods::RESOURCES_SUBSCRIBE => ->(_) {},
-        Methods::RESOURCES_UNSUBSCRIBE => ->(_) {},
-        Methods::COMPLETION_COMPLETE => ->(_) {},
+        Methods::RESOURCES_SUBSCRIBE => ->(_) { {} },
+        Methods::RESOURCES_UNSUBSCRIBE => ->(_) { {} },
+        Methods::COMPLETION_COMPLETE => ->(_) { { completion: { values: [], hasMore: false } } },
         Methods::ELICITATION_CREATE => ->(_) {},
       }
       @transport = transport
@@ -168,6 +172,21 @@ module MCP
       report_exception(e, { notification: "resources_list_changed" })
     end
 
+    def notify_progress(progress_token:, progress:, total: nil, message: nil)
+      return unless @transport
+
+      params = {
+        "progressToken" => progress_token,
+        "progress" => progress,
+        "total" => total,
+        "message" => message,
+      }.compact
+
+      @transport.send_notification(Methods::NOTIFICATIONS_PROGRESS, params)
+    rescue => e
+      report_exception(e, notification: "progress")
+    end
+
     def notify_log_message(data:, level:, logger: nil)
       return unless @transport
       return unless logging_message_notification&.should_notify?(level)
@@ -219,6 +238,14 @@ module MCP
           message = "Error occurred in server_info. `description` is not supported in protocol version 2025-06-18 or earlier"
           raise ArgumentError, message
         end
+
+        tools_with_ref = @tools.each_with_object([]) do |(tool_name, tool), names|
+          names << tool_name if schema_contains_ref?(tool.input_schema_value.to_h)
+        end
+        unless tools_with_ref.empty?
+          message = "Error occurred in #{tools_with_ref.join(", ")}. `$ref` in input schemas is supported by protocol version 2025-11-25 or higher"
+          raise ArgumentError, message
+        end
       end
 
       if @configuration.protocol_version <= "2025-03-26"
@@ -259,6 +286,17 @@ module MCP
       raise ToolNotUnique, duplicated_tool_names unless duplicated_tool_names.empty?
     end
 
+    def schema_contains_ref?(schema)
+      case schema
+      when Hash
+        schema.any? { |key, value| key.to_s == "$ref" || schema_contains_ref?(value) }
+      when Array
+        schema.any? { |element| schema_contains_ref?(element) }
+      else
+        false
+      end
+    end
+
     def handle_request(request, method)
       handler = @handlers[method]
       unless handler
@@ -400,7 +438,9 @@ module MCP
         end
       end
 
-      call_tool_with_args(tool, arguments)
+      progress_token = request.dig(:_meta, :progressToken)
+
+      call_tool_with_args(tool, arguments, server_context_with_meta(request), progress_token: progress_token)
     rescue RequestHandlerError
       raise
     rescue => e
@@ -426,7 +466,7 @@ module MCP
       prompt_args = request[:arguments]
       prompt.validate_arguments!(prompt_args)
 
-      call_prompt_template_with_args(prompt, prompt_args)
+      call_prompt_template_with_args(prompt, prompt_args, server_context_with_meta(request))
     end
 
     def list_resources(request)
@@ -469,22 +509,37 @@ module MCP
       parameters.any? { |type, name| type == :keyrest || name == :server_context }
     end
 
-    def call_tool_with_args(tool, arguments)
+    def call_tool_with_args(tool, arguments, context, progress_token: nil)
       args = arguments&.transform_keys(&:to_sym) || {}
 
       if accepts_server_context?(tool.method(:call))
+        progress = Progress.new(server: self, progress_token: progress_token)
+        server_context = ServerContext.new(context, progress: progress)
         tool.call(**args, server_context: server_context).to_h
       else
         tool.call(**args).to_h
       end
     end
 
-    def call_prompt_template_with_args(prompt, args)
+    def call_prompt_template_with_args(prompt, args, server_context)
       if accepts_server_context?(prompt.method(:template))
         prompt.template(args, server_context: server_context).to_h
       else
         prompt.template(args).to_h
       end
     end
+
+    def server_context_with_meta(request)
+      meta = request[:_meta]
+      if meta && @server_context.is_a?(Hash)
+        context = @server_context.dup
+        context[:_meta] = meta
+        context
+      elsif meta && @server_context.nil?
+        { _meta: meta }
+      else
+        @server_context
+      end
+    end
   end
 end

data/lib/mcp/server_context.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module MCP
+  class ServerContext
+    def initialize(context, progress:)
+      @context = context
+      @progress = progress
+    end
+
+    def report_progress(progress, total: nil, message: nil)
+      @progress.report(progress, total: total, message: message)
+    end
+
+    def method_missing(name, ...)
+      if @context.respond_to?(name)
+        @context.public_send(name, ...)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(name, include_private = false)
+      @context.respond_to?(name) || super
+    end
+  end
+end

data/lib/mcp/tool/schema.rb

@@ -31,10 +31,6 @@ module MCP
         case schema
         when Hash
           schema.each_with_object({}) do |(key, value), result|
-            if key.casecmp?("$ref")
-              raise ArgumentError, "Invalid JSON Schema: $ref is not allowed in tool schemas"
-            end
-
             result[yield(key)] = deep_transform_keys(value, &block)
           end
         when Array

data/lib/mcp/tool.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+require_relative "tool/annotations"
+require_relative "tool/input_schema"
+require_relative "tool/output_schema"
+require_relative "tool/response"
+
 module MCP
   class Tool
     class << self

data/lib/mcp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MCP
-  VERSION = "0.7.1"
+  VERSION = "0.9.0"
 end

data/lib/mcp.rb

@@ -1,36 +1,22 @@
 # frozen_string_literal: true
 
 require_relative "json_rpc_handler"
-require_relative "mcp/annotations"
 require_relative "mcp/configuration"
-require_relative "mcp/content"
-require_relative "mcp/icon"
-require_relative "mcp/instrumentation"
-require_relative "mcp/methods"
-require_relative "mcp/prompt"
-require_relative "mcp/prompt/argument"
-require_relative "mcp/prompt/message"
-require_relative "mcp/prompt/result"
-require_relative "mcp/resource"
-require_relative "mcp/resource/contents"
-require_relative "mcp/resource/embedded"
-require_relative "mcp/resource_template"
-require_relative "mcp/server"
-require_relative "mcp/server/transports/streamable_http_transport"
-require_relative "mcp/server/transports/stdio_transport"
 require_relative "mcp/string_utils"
-require_relative "mcp/tool"
-require_relative "mcp/tool/input_schema"
-require_relative "mcp/tool/output_schema"
-require_relative "mcp/tool/response"
-require_relative "mcp/tool/annotations"
 require_relative "mcp/transport"
 require_relative "mcp/version"
-require_relative "mcp/client"
-require_relative "mcp/client/http"
-require_relative "mcp/client/tool"
 
 module MCP
+  autoload :Annotations, "mcp/annotations"
+  autoload :Client, "mcp/client"
+  autoload :Content, "mcp/content"
+  autoload :Icon, "mcp/icon"
+  autoload :Prompt, "mcp/prompt"
+  autoload :Resource, "mcp/resource"
+  autoload :ResourceTemplate, "mcp/resource_template"
+  autoload :Server, "mcp/server"
+  autoload :Tool, "mcp/tool"
+
   class << self
     def configure
       yield(configuration)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcp
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Model Context Protocol
@@ -30,40 +30,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitattributes"
-- ".github/dependabot.yml"
-- ".github/workflows/ci.yml"
-- ".github/workflows/release.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- AGENTS.md
-- CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- Gemfile
 - LICENSE
 - README.md
-- RELEASE.md
-- Rakefile
-- SECURITY.md
-- bin/console
-- bin/generate-gh-pages.sh
-- bin/rake
-- bin/setup
-- dev.yml
-- docs/_config.yml
-- docs/index.md
-- docs/latest/index.html
-- examples/README.md
-- examples/http_client.rb
-- examples/http_server.rb
-- examples/stdio_server.rb
-- examples/streamable_http_client.rb
-- examples/streamable_http_server.rb
 - lib/json_rpc_handler.rb
 - lib/mcp.rb
 - lib/mcp/annotations.rb
 - lib/mcp/client.rb
 - lib/mcp/client/http.rb
+- lib/mcp/client/stdio.rb
 - lib/mcp/client/tool.rb
 - lib/mcp/configuration.rb
 - lib/mcp/content.rb
@@ -71,6 +45,7 @@ files:
 - lib/mcp/instrumentation.rb
 - lib/mcp/logging_message_notification.rb
 - lib/mcp/methods.rb
+- lib/mcp/progress.rb
 - lib/mcp/prompt.rb
 - lib/mcp/prompt/argument.rb
 - lib/mcp/prompt/message.rb
@@ -81,8 +56,10 @@ files:
 - lib/mcp/resource_template.rb
 - lib/mcp/server.rb
 - lib/mcp/server/capabilities.rb
+- lib/mcp/server/transports.rb
 - lib/mcp/server/transports/stdio_transport.rb
 - lib/mcp/server/transports/streamable_http_transport.rb
+- lib/mcp/server_context.rb
 - lib/mcp/string_utils.rb
 - lib/mcp/tool.rb
 - lib/mcp/tool/annotations.rb
@@ -93,13 +70,12 @@ files:
 - lib/mcp/transport.rb
 - lib/mcp/transports/stdio.rb
 - lib/mcp/version.rb
-- mcp.gemspec
 homepage: https://github.com/modelcontextprotocol/ruby-sdk
 licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/modelcontextprotocol/ruby-sdk/releases/tag/v0.7.1
+  changelog_uri: https://github.com/modelcontextprotocol/ruby-sdk/releases/tag/v0.9.0
   homepage_uri: https://github.com/modelcontextprotocol/ruby-sdk
   source_code_uri: https://github.com/modelcontextprotocol/ruby-sdk
   bug_tracker_uri: https://github.com/modelcontextprotocol/ruby-sdk/issues
@@ -118,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: The official Ruby SDK for Model Context Protocol servers and clients
 test_files: []

data/.gitattributes

@@ -1,4 +0,0 @@
-# See https://git-scm.com/docs/gitattributes for more about git attribute files.
-
-# Mark any vendored files as having been vendored.
-vendor/* linguist-vendored

data/.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: 'github-actions'
-    directory: '/'
-    schedule:
-      interval: 'weekly'

data/.github/workflows/ci.yml

@@ -1,54 +0,0 @@
-name: CI
-on: [push, pull_request]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    strategy:
-      matrix:
-        entry:
-          - { ruby: '2.7', allowed-failure: false }
-          - { ruby: '3.0', allowed-failure: false }
-          - { ruby: '3.1', allowed-failure: false }
-          - { ruby: '3.2', allowed-failure: false }
-          - { ruby: '3.3', allowed-failure: false }
-          - { ruby: '3.4', allowed-failure: false }
-          - { ruby: '4.0', allowed-failure: false }
-          - { ruby: 'head', allowed-failure: true }
-    name: Test Ruby ${{ matrix.entry.ruby }}
-    steps:
-      - uses: actions/checkout@v6
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.entry.ruby }}
-          bundler-cache: true
-      - run: bundle exec rake test
-        continue-on-error: ${{ matrix.entry.allowed-failure }}
-
-  rubocop:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    name: RuboCop
-    steps:
-      - uses: actions/checkout@v6
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 4.0 # Specify the latest supported Ruby version.
-          bundler-cache: true
-      - run: bundle exec rake rubocop
-
-  yard:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    name: YARD Documentation
-    steps:
-      - uses: actions/checkout@v6
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 4.0 # Specify the latest supported Ruby version.
-          bundler-cache: true
-      - run: bundle exec yard --no-output

data/.github/workflows/release.yml

@@ -1,57 +0,0 @@
-name: Release new version
-on:
-  push:
-    branches: [main]
-    paths:
-      - "lib/mcp/version.rb"
-jobs:
-  publish_gem:
-    if: github.repository_owner == 'modelcontextprotocol'
-    name: Release Gem Version to RubyGems.org
-    runs-on: ubuntu-latest
-
-    environment: release
-
-    permissions:
-      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
-      contents: write # IMPORTANT: this permission is required for `rake release` to push the release tag
-    steps:
-      - uses: actions/checkout@v6
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-          ruby-version: 4.0
-      - uses: rubygems/release-gem@v1
-
-  publish_gh_pages:
-    if: github.repository_owner == 'modelcontextprotocol'
-    name: Publish Documentation to GitHub Pages
-    runs-on: ubuntu-latest
-    needs: [publish_gem]
-
-    permissions:
-      contents: write
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0 # Fetch all history for all branches and tags
-
-      - name: Configure Git
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
-      - name: Get version tag
-        id: version
-        run: |
-          git fetch --tags
-          TAG=$(git describe --tags --exact-match HEAD)
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-
-      - name: Generate GitHub Pages
-        run: ./bin/generate-gh-pages.sh ${{ steps.version.outputs.tag }}
-
-      - name: Push to gh-pages
-        run: git push origin gh-pages

data/.gitignore

@@ -1,10 +0,0 @@
-.ruby-version
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-Gemfile.lock

data/.rubocop.yml

@@ -1,15 +0,0 @@
-inherit_gem:
-  rubocop-shopify: rubocop.yml
-
-plugins:
-  - rubocop-minitest
-  - rubocop-rake
-
-AllCops:
-  TargetRubyVersion: 2.7
-
-Gemspec/DevelopmentDependencies:
-  Enabled: true
-
-Minitest/LiteralAsActualArgument:
-  Enabled: true