ruby_llm_swarm-mcp 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5ee1e3f459d8555cc547963bd6470dfa16e14c0c57e788064e604084dc6909b
-  data.tar.gz: 7b423a5ec9acd5a9554c3a6903bfde6536e30e9c5d5ab9c01aa484cab7bd0fa7
+  metadata.gz: 86b08066123fbc46a3f965206011a4cbec8f140a43434e665d70c2a01157c091
+  data.tar.gz: 8b7a44c842bdbcbdd48f8fade4f32b8fac318d65a74d11d4fe9702a6a264412f
 SHA512:
-  metadata.gz: c144bc4598c9aaff5155f84e188a5b8adb8543caaea84c3d55b244eca0f98f3ed90de465233b2f0887e1231c65e32375b0ea6832fc8ee734693f602e610beada
-  data.tar.gz: 5b7d3e98e3126921e49e34a9b9569dbabf21fa5125e6e5342bcaab25b367da38fb13abd751bc9c267f591501fbbdd0d712e07e1d6d393682d3a6cbdc409c725a
+  metadata.gz: 43457242405497bba19d364ce57ee2110062a09ba60e3613c3165febd345de02fec7143ea62f1227c4ef93bf07b991f2d8b266a317f3bb4f9ede03c9662ff5d3
+  data.tar.gz: 6dba674bd7b82b96e872cab2b11a453e5111973ac1c99f1c5b9a31d1d3330ba768b08ee9a5b804a5c5e335f1e071feae2b58048c2939afb700719fcc4c2d21e4

data/README.md

@@ -15,13 +15,12 @@ Currently full support for MCP protocol version up to `2025-06-18`.
 
 ## RubyLLM::MCP Features
 
-- 🎛️ **Dual SDK Support** _(v0.8+)_: Choose between native full-featured implementation or official MCP SDK
-- 🔌 **Multiple Transport Types**: Streamable HTTP, STDIO, and SSE transports
+- 🔌 **Multiple Transport Types**: Streamable HTTP, and STDIO and legacy SSE transports
 - 🛠️ **Tool Integration**: Automatically converts MCP tools into RubyLLM-compatible tools
 - 📄 **Resource Management**: Access and include MCP resources (files, data) and resource templates in conversations
 - 🎯 **Prompt Integration**: Use predefined MCP prompts with arguments for consistent interactions
-- 🎨 **Client Features**: Support for sampling, roots, progress tracking, human-in-the-loop, and elicitation
-- 🔧 **Enhanced Chat Interface**: Extended RubyLLM chat methods for seamless MCP integration
+- 🎛️ **Client Features**: Support for sampling, roots, and elicitation
+- 🎨 **Enhanced Chat Interface**: Extended RubyLLM chat methods for seamless MCP integration
 - 🔄 **Multiple Client Management**: Create and manage multiple MCP clients simultaneously for different servers and purposes
 - 📚 **Simple API**: Easy-to-use interface that integrates seamlessly with RubyLLM
 
@@ -49,46 +48,6 @@ Or install it yourself as:
 gem install ruby_llm-mcp
 ```
 
-## Choosing an Adapter
-
-Starting with version 0.8.0, RubyLLM MCP supports multiple SDK adapters:
-
-### RubyLLM Adapter (Default)
-
-The native implementation with full MCP protocol support:
-
-```ruby
-client = RubyLLM::MCP.client(
-  name: "server",
-  adapter: :ruby_llm,  # Default, can be omitted
-  transport_type: :stdio,
-  config: { command: "mcp-server" }
-)
-```
-
-**Features**: All MCP features including SSE transport, sampling, roots, progress tracking, etc.
-
-### MCP SDK Adapter
-
-The official Anthropic-maintained SDK:
-
-```ruby
-# Add to Gemfile
-gem 'mcp', '~> 0.4'
-
-# Use in code
-client = RubyLLM::MCP.client(
-  name: "server",
-  adapter: :mcp_sdk,
-  transport_type: :stdio,
-  config: { command: "mcp-server" }
-)
-```
-
-**Features**: Core MCP features (tools, resources, prompts). No SSE, sampling, or advanced features.
-
-See the [Adapters Guide](https://rubyllm-mcp.com/guides/adapters.html) for detailed comparison.
-
 ## Usage
 
 ### Basic Setup

data/lib/generators/ruby_llm/mcp/install/templates/initializer.rb

@@ -2,11 +2,6 @@
 
 # Configure RubyLLM MCP
 RubyLLM::MCP.configure do |config|
-  # Default SDK adapter to use (:ruby_llm or :mcp_sdk)
-  # - :ruby_llm: Full-featured, supports all MCP features + extensions
-  # - :mcp_sdk: Official SDK, limited features but maintained by Anthropic
-  config.default_adapter = :ruby_llm
-
   # Request timeout in milliseconds
   config.request_timeout = 8000
 
@@ -22,35 +17,23 @@ RubyLLM::MCP.configure do |config|
   # Launch MCPs (:automatic, :manual)
   config.launch_control = :automatic
 
-  # Configure roots for file system access (RubyLLM adapter only)
+  # Configure roots for file system access
   # config.roots = [
   #   Rails.root.to_s
   # ]
 
-  # Configure sampling (RubyLLM adapter only)
+  # Configure sampling (optional)
   config.sampling.enabled = false
 
   # Set preferred model for sampling
   # config.sampling.preferred_model do
+  #   # Return the preferred model name
   #   "claude-sonnet-4"
   # end
 
   # Set a guard for sampling
   # config.sampling.guard do
+  #   # Return true to enable sampling, false to disable
   #   Rails.env.development?
   # end
-
-  # Event handlers (RubyLLM adapter only)
-  # config.on_progress do |progress_token, progress, total|
-  #   # Handle progress updates
-  # end
-
-  # config.on_human_in_the_loop do |tool_name, arguments|
-  #   # Return true to allow, false to deny
-  #   true
-  # end
-
-  # config.on_logging do |level, logger_name, data|
-  #   # Handle logging from MCP servers
-  # end
 end

data/lib/generators/ruby_llm/mcp/install/templates/mcps.yml

@@ -1,9 +1,5 @@
 mcp_servers:
   filesystem:
-    # SDK adapter to use (optional, defaults to config.default_adapter)
-    # Options: ruby_llm, mcp_sdk
-    # adapter: ruby_llm
-
     transport_type: stdio
     command: npx
     args:
@@ -11,19 +7,3 @@ mcp_servers:
       - "<%%= Rails.root %>"
     env: {}
     with_prefix: true
-
-  # Example with MCP SDK (official)
-  # weather:
-  #   adapter: mcp_sdk
-  #   transport_type: http
-  #   url: "https://api.example.com/mcp"
-  #   headers:
-  #     Authorization: "Bearer <%%= ENV['WEATHER_API_KEY'] %>"
-
-  # Example with SSE (RubyLLM adapter only)
-  # notifications:
-  #   adapter: ruby_llm
-  #   transport_type: sse
-  #   url: "https://api.example.com/mcp/sse"
-  #   headers:
-  #     Authorization: "Bearer <%%= ENV['API_KEY'] %>"

data/lib/ruby_llm/mcp/auth/browser/http_server.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "cgi"
+require "socket"
+
 module RubyLLM
   module MCP
     module Auth

data/lib/ruby_llm/mcp/auth/browser/opener.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rbconfig"
+
 module RubyLLM
   module MCP
     module Auth

data/lib/ruby_llm/mcp/auth/browser/pages.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "cgi"
+
 module RubyLLM
   module MCP
     module Auth
@@ -86,37 +88,7 @@ module RubyLLM
                     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif;
                   }
 
-                  /* Logo card in top right */
-                  .logo-card {
-                    position: fixed;
-                    top: 1rem;
-                    right: 1rem;
-                    background: var(--card-bg);
-                    border-radius: 0.75rem;
-                    padding: 0.625rem;
-                    box-shadow: 0 10px 25px rgba(0,0,0,0.2);
-                    display: flex;
-                    align-items: center;
-                    gap: 0.5rem;
-                    opacity: 0;
-                    transform: translateY(-20px);
-                    animation: slide-in 500ms ease-out 200ms forwards;
-                  }
-                  .logo {
-                    width: 32px;
-                    height: 32px;
-                    border-radius: 0.375rem;
-                    border: 1.5px solid var(--logo-border);
-                    flex-shrink: 0;
-                  }
-                  .logo-text {
-                    font-weight: 600;
-                    font-size: 0.875rem;
-                    color: var(--text-900);
-                    white-space: nowrap;
-                  }
-
-                  /* Main Card */
+                  /* Card */
                   .card {
                     width: 100%;
                     max-width: 32rem;
@@ -131,6 +103,17 @@ module RubyLLM
                     animation: pop-in 500ms ease-out forwards;
                   }
 
+                  /* MCP logo + border */
+                  .logo {
+                    width: 120px;
+                    height: 120px;
+                    display: block;
+                    margin: 0 auto 1.5rem;
+                    border-radius: 1rem;
+                    border: 2px solid var(--logo-border);
+                    background: transparent;
+                  }
+
                   /* SVG check animation */
                   .checkwrap {
                     display: flex;
@@ -208,7 +191,6 @@ module RubyLLM
 
                   /* Animations */
                   @keyframes pop-in { to { opacity: 1; transform: scale(1); } }
-                  @keyframes slide-in { to { opacity: 1; transform: translateY(0); } }
                   @keyframes draw-circle {
                     0% { opacity: 0; stroke-dashoffset: 339.292; }
                     20% { opacity: 1; }
@@ -223,23 +205,11 @@ module RubyLLM
 
                   /* Motion-reduction respect */
                   @media (prefers-reduced-motion: reduce) {
-                    .card, .logo-card, .circle, .tick, .content { animation: none !important; }
-                    .card, .logo-card { opacity: 1; transform: none; }
+                    .card, .circle, .tick, .content { animation: none !important; }
+                    .card { opacity: 1; transform: none; }
                     .content { opacity: 1; transform: none; }
                   }
 
-                  /* Responsive adjustments */
-                  @media (max-width: 640px) {
-                    .logo-card {
-                      top: 0.75rem;
-                      right: 0.75rem;
-                      padding: 0.5rem;
-                      gap: 0.375rem;
-                    }
-                    .logo { width: 28px; height: 28px; }
-                    .logo-text { font-size: 0.75rem; }
-                  }
-
                   /* =========================
                      Dark Mode (automatic)
                      ========================= */
@@ -279,7 +249,7 @@ module RubyLLM
                 <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#151417" />
               </head>
               <body>
-                <div class="logo-card">
+                <main class="card" role="dialog" aria-labelledby="title" aria-describedby="desc">
                   <img
                     class="logo"
                     src="https://www.rubyllm-mcp.com/assets/images/rubyllm-mcp-logo.svg"
@@ -287,10 +257,7 @@ module RubyLLM
                     decoding="async"
                     fetchpriority="high"
                   />
-                  <span class="logo-text">RubyLLM::MCP</span>
-                </div>
 
-                <main class="card" role="dialog" aria-labelledby="title" aria-describedby="desc">
                   <div class="checkwrap">
                     <svg class="checkmark" viewBox="0 0 120 120" aria-hidden="true">
                       <circle class="circle" cx="60" cy="60" r="54"></circle>
@@ -357,37 +324,7 @@ module RubyLLM
                     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif;
                   }
 
-                  /* Logo card in top right */
-                  .logo-card {
-                    position: fixed;
-                    top: 1rem;
-                    right: 1rem;
-                    background: var(--card-bg);
-                    border-radius: 0.75rem;
-                    padding: 0.625rem;
-                    box-shadow: 0 10px 25px rgba(0,0,0,0.2);
-                    display: flex;
-                    align-items: center;
-                    gap: 0.5rem;
-                    opacity: 0;
-                    transform: translateY(-20px);
-                    animation: slide-in 500ms ease-out 200ms forwards;
-                  }
-                  .logo {
-                    width: 32px;
-                    height: 32px;
-                    border-radius: 0.375rem;
-                    border: 1.5px solid var(--logo-border);
-                    flex-shrink: 0;
-                  }
-                  .logo-text {
-                    font-weight: 600;
-                    font-size: 0.875rem;
-                    color: var(--text-900);
-                    white-space: nowrap;
-                  }
-
-                  /* Main Card */
+                  /* Card */
                   .card {
                     width: 100%;
                     max-width: 32rem;
@@ -402,6 +339,16 @@ module RubyLLM
                     animation: pop-in 500ms ease-out forwards;
                   }
 
+                  /* MCP logo */
+                  .logo {
+                    width: 120px;
+                    height: 120px;
+                    display: block;
+                    margin: 0 auto 1.5rem;
+                    border-radius: 1rem;
+                    border: 2px solid var(--logo-border);
+                  }
+
                   /* Animated error icon (circle + X) */
                   .iconwrap {
                     display: flex;
@@ -498,7 +445,6 @@ module RubyLLM
 
                   /* Animations */
                   @keyframes pop-in { to { opacity: 1; transform: scale(1); } }
-                  @keyframes slide-in { to { opacity: 1; transform: translateY(0); } }
                   @keyframes draw-circle {
                     0% { opacity: 0; stroke-dashoffset: 339.292; }
                     20% { opacity: 1; }
@@ -512,23 +458,11 @@ module RubyLLM
                   @keyframes rise-in { to { opacity: 1; transform: translateY(0); } }
 
                   @media (prefers-reduced-motion: reduce) {
-                    .card, .logo-card, .circle, .x1, .x2, .content { animation: none !important; }
-                    .card, .logo-card { opacity: 1; transform: none; }
+                    .card, .circle, .x1, .x2, .content { animation: none !important; }
+                    .card { opacity: 1; transform: none; }
                     .content { opacity: 1; transform: none; }
                   }
 
-                  /* Responsive adjustments */
-                  @media (max-width: 640px) {
-                    .logo-card {
-                      top: 0.75rem;
-                      right: 0.75rem;
-                      padding: 0.5rem;
-                      gap: 0.375rem;
-                    }
-                    .logo { width: 28px; height: 28px; }
-                    .logo-text { font-size: 0.75rem; }
-                  }
-
                   /* =========================
                      Dark Mode (automatic)
                      ========================= */
@@ -567,7 +501,8 @@ module RubyLLM
                 </style>
               </head>
               <body>
-                <div class="logo-card">
+                <main class="card" role="dialog" aria-labelledby="title" aria-describedby="desc">
+                  <!-- MCP Logo -->
                   <img
                     class="logo"
                     src="https://www.rubyllm-mcp.com/assets/images/rubyllm-mcp-logo.svg"
@@ -575,10 +510,7 @@ module RubyLLM
                     decoding="async"
                     fetchpriority="high"
                   />
-                  <span class="logo-text">RubyLLM::MCP</span>
-                </div>
 
-                <main class="card" role="dialog" aria-labelledby="title" aria-describedby="desc">
                   <!-- Animated Error Icon -->
                   <div class="iconwrap" aria-hidden="true">
                     <svg class="erroricon" viewBox="0 0 120 120">

data/lib/ruby_llm/mcp/auth/browser_oauth_provider.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+require_relative "browser/http_server"
+require_relative "browser/callback_handler"
+require_relative "browser/pages"
+require_relative "browser/opener"
+require_relative "browser/callback_server"
+
 module RubyLLM
   module MCP
     module Auth
@@ -155,38 +161,6 @@ module RubyLLM
           @oauth_provider.complete_authorization_flow(code, state)
         end
 
-        # Handle authentication challenge with browser-based auth
-        # @param www_authenticate [String, nil] WWW-Authenticate header value
-        # @param resource_metadata_url [String, nil] Resource metadata URL from response
-        # @param requested_scope [String, nil] Scope from WWW-Authenticate challenge
-        # @return [Boolean] true if authentication was completed successfully
-        def handle_authentication_challenge(www_authenticate: nil, resource_metadata_url: nil, requested_scope: nil)
-          @logger.debug("BrowserOAuthProvider handling authentication challenge")
-
-          # Try standard provider's automatic handling first (token refresh, client credentials)
-          begin
-            return @oauth_provider.handle_authentication_challenge(
-              www_authenticate: www_authenticate,
-              resource_metadata_url: resource_metadata_url,
-              requested_scope: requested_scope
-            )
-          rescue Errors::AuthenticationRequiredError
-            # Standard provider couldn't handle it - need interactive auth
-            @logger.info("Automatic authentication failed, starting browser-based OAuth flow")
-          end
-
-          # Perform full browser-based authentication
-          authenticate(auto_open_browser: true)
-          true
-        end
-
-        # Parse WWW-Authenticate header (delegate to oauth_provider)
-        # @param header [String] WWW-Authenticate header value
-        # @return [Hash] parsed challenge information
-        def parse_www_authenticate(header)
-          @oauth_provider.parse_www_authenticate(header)
-        end
-
         private
 
         # Validate and synchronize redirect_uri between this provider and oauth_provider

data/lib/ruby_llm/mcp/auth/http_response_handler.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "json"
+
 module RubyLLM
   module MCP
     module Auth

data/lib/ruby_llm/mcp/auth/memory_storage.rb

@@ -12,7 +12,6 @@ module RubyLLM
           @server_metadata = {}
           @pkce_data = {}
           @state_data = {}
-          @resource_metadata = {}
         end
 
         # Token storage
@@ -24,10 +23,6 @@ module RubyLLM
           @tokens[server_url] = token
         end
 
-        def delete_token(server_url)
-          @tokens.delete(server_url)
-        end
-
         # Client registration storage
         def get_client_info(server_url)
           @client_infos[server_url]
@@ -71,19 +66,6 @@ module RubyLLM
         def delete_state(server_url)
           @state_data.delete(server_url)
         end
-
-        # Resource metadata management
-        def get_resource_metadata(server_url)
-          @resource_metadata[server_url]
-        end
-
-        def set_resource_metadata(server_url, metadata)
-          @resource_metadata[server_url] = metadata
-        end
-
-        def delete_resource_metadata(server_url)
-          @resource_metadata.delete(server_url)
-        end
       end
     end
   end

data/lib/ruby_llm/mcp/auth/oauth_provider.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "httpx"
+require "uri"
+
 module RubyLLM
   module MCP
     module Auth
@@ -150,88 +153,6 @@ module RubyLLM
           request.headers["Authorization"] = token.to_header
         end
 
-        # Handle authentication challenge from server (401 response)
-        # Attempts to refresh token or raises error if interactive auth required
-        # @param www_authenticate [String, nil] WWW-Authenticate header value
-        # @param resource_metadata_url [String, nil] Resource metadata URL from response
-        # @param requested_scope [String, nil] Scope from WWW-Authenticate challenge
-        # @return [Boolean] true if authentication was refreshed successfully
-        # @raise [Errors::AuthenticationRequiredError] if interactive auth is required
-        def handle_authentication_challenge(www_authenticate: nil, resource_metadata_url: nil, requested_scope: nil)
-          logger.debug("Handling authentication challenge")
-          logger.debug("  WWW-Authenticate: #{www_authenticate}") if www_authenticate
-          logger.debug("  Resource metadata URL: #{resource_metadata_url}") if resource_metadata_url
-          logger.debug("  Requested scope: #{requested_scope}") if requested_scope
-
-          # Parse WWW-Authenticate header if provided
-          final_requested_scope = requested_scope
-          if www_authenticate
-            challenge_info = parse_www_authenticate(www_authenticate)
-            final_requested_scope ||= challenge_info[:scope]
-            # NOTE: resource_metadata_url from challenge_info could be used for future discovery
-          end
-
-          # Update scope if server requested different scope
-          if final_requested_scope && final_requested_scope != scope
-            logger.debug("Updating scope from '#{scope}' to '#{final_requested_scope}'")
-            self.scope = final_requested_scope
-          end
-
-          # Try to refresh existing token
-          token = storage.get_token(server_url)
-          if token&.refresh_token
-            logger.debug("Attempting token refresh with existing refresh token")
-            refreshed_token = refresh_token(token)
-            return true if refreshed_token
-          end
-
-          # If we have client credentials, try that flow
-          if grant_type == :client_credentials
-            logger.debug("Attempting client credentials flow")
-            begin
-              new_token = client_credentials_flow(scope: requested_scope)
-              return true if new_token
-            rescue StandardError => e
-              logger.warn("Client credentials flow failed: #{e.message}")
-            end
-          end
-
-          # Cannot automatically authenticate - interactive auth required
-          logger.warn("Cannot automatically authenticate - interactive authorization required")
-          raise Errors::AuthenticationRequiredError.new(
-            message: "OAuth authentication required. Token refresh failed and interactive authorization is needed."
-          )
-        end
-
-        # Parse WWW-Authenticate header to extract challenge parameters
-        # @param header [String] WWW-Authenticate header value
-        # @return [Hash] parsed challenge information
-        def parse_www_authenticate(header)
-          result = {}
-
-          # Example: Bearer realm="example", scope="mcp:read mcp:write", resource_metadata_url="https://..."
-          if header =~ /Bearer\s+(.+)/i
-            params = ::Regexp.last_match(1)
-
-            # Extract scope
-            if params =~ /scope="([^"]+)"/
-              result[:scope] = ::Regexp.last_match(1)
-            end
-
-            # Extract resource metadata URL
-            if params =~ /resource_metadata_url="([^"]+)"/
-              result[:resource_metadata_url] = ::Regexp.last_match(1)
-            end
-
-            # Extract realm
-            if params =~ /realm="([^"]+)"/
-              result[:realm] = ::Regexp.last_match(1)
-            end
-          end
-
-          result
-        end
-
         private
 
         # Create HTTP client for OAuth requests

data/lib/ruby_llm/mcp/auth/session_manager.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "securerandom"
+
 module RubyLLM
   module MCP
     module Auth

data/lib/ruby_llm/mcp/auth/url_builder.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "uri"
+
 module RubyLLM
   module MCP
     module Auth