ruby_llm_swarm-mcp 0.8.0 → 0.8.1

data/lib/ruby_llm/mcp/client.rb

@@ -7,31 +7,23 @@ module RubyLLM
     class Client
       extend Forwardable
 
-      attr_reader :name, :config, :transport_type, :request_timeout, :log_level, :on, :roots, :adapter,
-                  :on_logging_level
+      attr_reader :name, :config, :transport_type, :request_timeout, :log_level, :on, :roots
       attr_accessor :linked_resources
 
-      def initialize(name:, transport_type:, sdk: nil, adapter: nil, start: true, # rubocop:disable Metrics/ParameterLists
-                     request_timeout: MCP.config.request_timeout, config: {})
+      def initialize(name:, transport_type:, start: true, request_timeout: MCP.config.request_timeout, config: {})
         @name = name
-        @transport_type = transport_type.to_sym
-        @adapter_type = adapter || sdk || MCP.config.default_adapter
-
-        # Validate early
-        MCP.config.adapter_config.validate!(
-          adapter: @adapter_type,
-          transport: @transport_type
-        )
-
         @with_prefix = config.delete(:with_prefix) || false
         @config = config.merge(request_timeout: request_timeout)
+        @transport_type = transport_type.to_sym
         @request_timeout = request_timeout
 
-        # Store OAuth config for later use
+        # Store OAuth config before coordinator setup
         @oauth_config = config[:oauth] || config["oauth"]
         @oauth_provider = nil
         @oauth_storage = nil
 
+        @coordinator = setup_coordinator
+
         @on = {}
         @tools = {}
         @resources = {}
@@ -42,30 +34,24 @@ module RubyLLM
 
         @linked_resources = []
 
-        # Build adapter based on configuration
-        @adapter = build_adapter
-
-        setup_roots if @adapter.supports?(:roots)
-        setup_sampling if @adapter.supports?(:sampling)
-        setup_event_handlers
+        setup_roots
+        setup_sampling
 
-        @adapter.start if start
+        @coordinator.start_transport if start
       end
 
-      def_delegators :@adapter, :alive?, :capabilities, :ping, :client_capabilities,
-                     :register_in_flight_request, :unregister_in_flight_request,
-                     :cancel_in_flight_request
+      def_delegators :@coordinator, :alive?, :capabilities, :ping, :client_capabilities
 
       def start
-        @adapter.start
+        @coordinator.start_transport
       end
 
       def stop
-        @adapter.stop
+        @coordinator.stop_transport
       end
 
       def restart!
-        @adapter.restart!
+        @coordinator.restart_transport
       end
 
       # Get or create OAuth provider for this client
@@ -77,7 +63,7 @@ module RubyLLM
         return @oauth_provider if @oauth_provider
 
         # Get provider from transport if it already exists
-        transport_oauth = transport_oauth_provider
+        transport_oauth = @coordinator.transport_oauth_provider
         return transport_oauth if transport_oauth
 
         # Create new provider lazily
@@ -103,11 +89,10 @@ module RubyLLM
       end
 
       def tools(refresh: false)
-        require_feature!(:tools)
         return [] unless capabilities.tools_list?
 
         fetch(:tools, refresh) do
-          tools = @adapter.tool_list
+          tools = @coordinator.tool_list
           build_map(tools, MCP::Tool, with_prefix: @with_prefix)
         end
 
@@ -125,11 +110,10 @@ module RubyLLM
       end
 
       def resources(refresh: false)
-        require_feature!(:resources)
         return [] unless capabilities.resources_list?
 
         fetch(:resources, refresh) do
-          resources = @adapter.resource_list
+          resources = @coordinator.resource_list
           resources = build_map(resources, MCP::Resource)
           include_linked_resources(resources)
         end
@@ -148,11 +132,10 @@ module RubyLLM
       end
 
       def resource_templates(refresh: false)
-        require_feature!(:resource_templates)
         return [] unless capabilities.resources_list?
 
         fetch(:resource_templates, refresh) do
-          resource_templates = @adapter.resource_template_list
+          resource_templates = @coordinator.resource_template_list
           build_map(resource_templates, MCP::ResourceTemplate)
         end
 
@@ -170,11 +153,10 @@ module RubyLLM
       end
 
       def prompts(refresh: false)
-        require_feature!(:prompts)
         return [] unless capabilities.prompt_list?
 
         fetch(:prompts, refresh) do
-          prompts = @adapter.prompt_list
+          prompts = @coordinator.prompt_list
           build_map(prompts, MCP::Prompt)
         end
 
@@ -196,11 +178,6 @@ module RubyLLM
       end
 
       def on_progress(&block)
-        require_feature!(:progress_tracking)
-        if alive?
-          @adapter.set_progress_tracking(enabled: true)
-        end
-
         @on[:progress] = block
         self
       end
@@ -210,7 +187,6 @@ module RubyLLM
       end
 
       def on_human_in_the_loop(&block)
-        require_feature!(:human_in_the_loop)
         @on[:human_in_the_loop] = block
         self
       end
@@ -224,10 +200,9 @@ module RubyLLM
       end
 
       def on_logging(level: Logging::WARNING, &block)
-        require_feature!(:logging)
         @on_logging_level = level
         if alive?
-          @adapter.set_logging(level: level)
+          @coordinator.set_logging(level: level)
         end
 
         @on[:logging] = block
@@ -239,7 +214,6 @@ module RubyLLM
       end
 
       def on_sampling(&block)
-        require_feature!(:sampling)
         @on[:sampling] = block
         self
       end
@@ -249,7 +223,6 @@ module RubyLLM
       end
 
       def on_elicitation(&block)
-        require_feature!(:elicitation)
         @on[:elicitation] = block
         self
       end
@@ -278,55 +251,10 @@ module RubyLLM
 
       private
 
-      # Get OAuth provider from adapter's transport if available
-      # @return [OAuthProvider, BrowserOAuthProvider, nil] OAuth provider or nil
-      def transport_oauth_provider
-        return nil unless @adapter
-
-        # For RubyLLMAdapter
-        if @adapter.respond_to?(:native_client)
-          transport = @adapter.native_client.transport
-          transport_protocol = transport.transport_protocol
-          return transport_protocol.oauth_provider if transport_protocol.respond_to?(:oauth_provider)
-        end
-
-        # For MCPSdkAdapter with wrapped transports
-        if @adapter.respond_to?(:mcp_client) && @adapter.instance_variable_get(:@mcp_client)
-          mcp_client = @adapter.instance_variable_get(:@mcp_client)
-          if mcp_client&.transport.respond_to?(:native_transport)
-            return mcp_client.transport.native_transport.oauth_provider
-          end
-        end
-
-        nil
-      end
-
-      def build_adapter
-        case @adapter_type
-        when :ruby_llm
-          RubyLLM::MCP::Adapters::RubyLLMAdapter.new(self,
-                                                     transport_type: @transport_type,
-                                                     config: @config)
-        when :mcp_sdk
-          RubyLLM::MCP::Adapters::MCPSdkAdapter.new(self,
-                                                    transport_type: @transport_type,
-                                                    config: @config)
-        else
-          raise ArgumentError, "Unknown adapter type: #{@adapter_type}"
-        end
-      end
-
-      def require_feature!(feature)
-        unless @adapter.supports?(feature)
-          raise Errors::UnsupportedFeature.new(
-            message: <<~MSG.strip
-              Feature '#{feature}' is not supported by the #{@adapter_type} adapter.
-
-              This feature requires the :ruby_llm adapter.
-              Change your configuration to use adapter: :ruby_llm
-            MSG
-          )
-        end
+      def setup_coordinator
+        Coordinator.new(self,
+                        transport_type: @transport_type,
+                        config: @config)
       end
 
       def fetch(cache_key, refresh)
@@ -340,9 +268,9 @@ module RubyLLM
       def build_map(raw_data, klass, with_prefix: false)
         raw_data.each_with_object({}) do |item, acc|
           instance = if with_prefix
-                       klass.new(@adapter, item, with_prefix: @with_prefix)
+                       klass.new(@coordinator, item, with_prefix: @with_prefix)
                      else
-                       klass.new(@adapter, item)
+                       klass.new(@coordinator, item)
                      end
           acc[instance.name] = instance
         end
@@ -357,7 +285,7 @@ module RubyLLM
       end
 
       def setup_roots
-        @roots = Roots.new(paths: MCP.config.roots, adapter: @adapter)
+        @roots = Roots.new(paths: MCP.config.roots, coordinator: @coordinator)
       end
 
       def setup_sampling
@@ -365,32 +293,17 @@ module RubyLLM
       end
 
       def setup_event_handlers
-        # Only setup handlers that are supported
-        if @adapter.supports?(:progress_tracking)
-          @on[:progress] = MCP.config.on_progress
-          if @on[:progress] && alive?
-            @adapter.set_progress_tracking(enabled: true)
-          end
-        end
-
-        if @adapter.supports?(:human_in_the_loop)
-          @on[:human_in_the_loop] = MCP.config.on_human_in_the_loop
-        end
-
-        if @adapter.supports?(:logging)
-          @on[:logging] = MCP.config.on_logging
-          @on_logging_level = MCP.config.on_logging_level
-        end
-
-        if @adapter.supports?(:elicitation)
-          @on[:elicitation] = MCP.config.on_elicitation
-        end
+        @on[:progress] = MCP.config.on_progress
+        @on[:human_in_the_loop] = MCP.config.on_human_in_the_loop
+        @on[:logging] = MCP.config.on_logging
+        @on_logging_level = MCP.config.on_logging_level
+        @on[:elicitation] = MCP.config.on_elicitation
       end
 
       # Get or create OAuth storage shared with transport
       def oauth_storage
         # Try to get storage from transport's OAuth provider
-        transport_oauth = transport_oauth_provider
+        transport_oauth = @coordinator.transport_oauth_provider
         return transport_oauth.storage if transport_oauth
 
         # Create new storage shared with client

data/lib/ruby_llm/mcp/configuration.rb

@@ -1,52 +1,12 @@
 # frozen_string_literal: true
 
+require "json"
+require "yaml"
+require "erb"
+
 module RubyLLM
   module MCP
     class Configuration
-      class AdapterConfig
-        VALID_ADAPTERS = %i[ruby_llm mcp_sdk].freeze
-        VALID_TRANSPORTS = %i[stdio sse streamable streamable_http http].freeze
-
-        attr_accessor :default_adapter
-
-        def initialize
-          @default_adapter = :ruby_llm
-        end
-
-        def validate!(adapter:, transport:)
-          validate_adapter!(adapter)
-          validate_transport!(transport)
-          validate_adapter_transport_combination!(adapter, transport)
-        end
-
-        def adapter_for(config)
-          config[:sdk] || config[:adapter] || @default_adapter
-        end
-
-        private
-
-        def validate_adapter!(adapter)
-          unless VALID_ADAPTERS.include?(adapter)
-            raise Errors::AdapterConfigurationError.new(
-              message: "Invalid adapter '#{adapter}'. Valid options: #{VALID_ADAPTERS.join(', ')}"
-            )
-          end
-        end
-
-        def validate_transport!(transport)
-          unless VALID_TRANSPORTS.include?(transport)
-            raise Errors::AdapterConfigurationError.new(
-              message: "Invalid transport '#{transport}'. Valid options: #{VALID_TRANSPORTS.join(', ')}"
-            )
-          end
-        end
-
-        def validate_adapter_transport_combination!(adapter, transport)
-          # SSE is supported by both ruby_llm and mcp_sdk adapters
-          # No validation needed at this time
-        end
-      end
-
       class Sampling
         attr_accessor :enabled
         attr_writer :preferred_model
@@ -165,7 +125,6 @@ module RubyLLM
                     :config_path,
                     :launch_control,
                     :on_logging_level,
-                    :adapter_config,
                     :oauth
 
       attr_writer :logger, :mcp_configuration
@@ -174,7 +133,6 @@ module RubyLLM
 
       def initialize
         @sampling = Sampling.new
-        @adapter_config = AdapterConfig.new
         @oauth = OAuth.new
         set_defaults
       end
@@ -191,20 +149,8 @@ module RubyLLM
         )
       end
 
-      # Convenience method for setting default adapter
-      def default_adapter=(adapter)
-        @adapter_config.default_adapter = adapter
-      end
-
-      def default_adapter
-        @adapter_config.default_adapter
-      end
-
-      # Validate MCP configuration before use
       def mcp_configuration
-        configs = @mcp_configuration + load_mcps_config
-        validate_configurations!(configs)
-        configs
+        @mcp_configuration + load_mcps_config
       end
 
       def on_progress(&block)
@@ -247,20 +193,6 @@ module RubyLLM
 
       private
 
-      def validate_configurations!(configs)
-        configs.each do |config|
-          adapter = @adapter_config.adapter_for(config)
-          transport = config[:transport_type]
-          # Convert string to symbol if needed
-          transport = transport.to_sym if transport.is_a?(String)
-
-          @adapter_config.validate!(
-            adapter: adapter,
-            transport: transport
-          )
-        end
-      end
-
       def load_mcps_config
         @config_file ||= ConfigFile.new(config_path)
         @config_file.parse
@@ -290,7 +222,7 @@ module RubyLLM
         @roots = []
 
         # Protocol configuration
-        @protocol_version = Native::Protocol.latest_version
+        @protocol_version = Protocol.latest_version
 
         # OAuth configuration
         @oauth = OAuth.new