ruby_llm-mcp 0.7.0 → 0.8.0

data/lib/ruby_llm/mcp/transports/stdio.rb

@@ -13,13 +13,14 @@ module RubyLLM
 
         attr_reader :command, :stdin, :stdout, :stderr, :id, :coordinator
 
-        def initialize(command:, coordinator:, request_timeout:, args: [], env: {})
+        def initialize(command:, coordinator:, request_timeout:, options: {})
           @request_timeout = request_timeout
           @command = command
           @coordinator = coordinator
-          @args = args
-          @env = env || {}
+          @args = options[:args] || options["args"] || []
+          @env = options[:env] || options["env"] || {}
           @client_id = SecureRandom.uuid
+          # NOTE: Stdio transport doesn't use OAuth (local process communication)
 
           @id_counter = 0
           @id_mutex = Mutex.new
@@ -78,51 +79,23 @@ module RubyLLM
           @running = true
         end
 
-        def close # rubocop:disable Metrics/MethodLength
+        def close
           @running = false
 
-          begin
-            @stdin&.close
-          rescue StandardError
-            nil
-          end
-
-          begin
-            @wait_thread&.join(1)
-          rescue StandardError
+          [@stdin, @stdout, @stderr].each do |stream|
+            stream&.close
+          rescue IOError, Errno::EBADF
             nil
           end
 
-          begin
-            @stdout&.close
-          rescue StandardError
-            nil
-          end
-
-          begin
-            @stderr&.close
+          [@wait_thread, @reader_thread, @stderr_thread].each do |thread|
+            thread&.join(1)
           rescue StandardError
             nil
           end
 
-          begin
-            @reader_thread&.join(1)
-          rescue StandardError
-            nil
-          end
-
-          begin
-            @stderr_thread&.join(1)
-          rescue StandardError
-            nil
-          end
-
-          @stdin = nil
-          @stdout = nil
-          @stderr = nil
-          @wait_thread = nil
-          @reader_thread = nil
-          @stderr_thread = nil
+          @stdin = @stdout = @stderr = nil
+          @wait_thread = @reader_thread = @stderr_thread = nil
         end
 
         def set_protocol_version(version)
@@ -151,58 +124,88 @@ module RubyLLM
 
         def start_reader_thread
           @reader_thread = Thread.new do
-            while @running
-              begin
-                if @stdout.closed? || @wait_thread.nil? || !@wait_thread.alive?
-                  sleep 1
-                  restart_process if @running
-                  next
-                end
-
-                line = @stdout.gets
-                next unless line && !line.strip.empty?
-
-                process_response(line.strip)
-              rescue IOError, Errno::EPIPE => e
-                RubyLLM::MCP.logger.error "Reader error: #{e.message}. Restarting in 1 second..."
-                sleep 1
-                restart_process if @running
-              rescue StandardError => e
-                RubyLLM::MCP.logger.error "Error in reader thread: #{e.message}, #{e.backtrace.join("\n")}"
-                sleep 1
-              end
-            end
+            read_stdout_loop
           end
 
           @reader_thread.abort_on_exception = true
         end
 
+        def read_stdout_loop
+          while @running
+            begin
+              handle_stdout_read
+            rescue IOError, Errno::EPIPE => e
+              handle_stream_error(e, "Reader")
+              break unless @running
+            rescue StandardError => e
+              RubyLLM::MCP.logger.error "Error in reader thread: #{e.message}, #{e.backtrace.join("\n")}"
+              sleep 1
+            end
+          end
+        end
+
+        def handle_stdout_read
+          if @stdout.closed? || @wait_thread.nil? || !@wait_thread.alive?
+            if @running
+              sleep 1
+              restart_process
+            end
+            return
+          end
+
+          line = @stdout.gets
+          return unless line && !line.strip.empty?
+
+          process_response(line.strip)
+        end
+
+        def handle_stream_error(error, stream_name)
+          # Check @running to distinguish graceful shutdown from unexpected errors.
+          # During shutdown, streams are closed intentionally and shouldn't trigger restarts.
+          if @running
+            RubyLLM::MCP.logger.error "#{stream_name} error: #{error.message}. Restarting in 1 second..."
+            sleep 1
+            restart_process
+          else
+            # Graceful shutdown in progress
+            RubyLLM::MCP.logger.debug "#{stream_name} thread exiting during shutdown"
+          end
+        end
+
         def start_stderr_thread
           @stderr_thread = Thread.new do
-            while @running
-              begin
-                if @stderr.closed? || @wait_thread.nil? || !@wait_thread.alive?
-                  sleep 1
-                  next
-                end
-
-                line = @stderr.gets
-                next unless line && !line.strip.empty?
-
-                RubyLLM::MCP.logger.info(line.strip)
-              rescue IOError, Errno::EPIPE => e
-                RubyLLM::MCP.logger.error "Stderr reader error: #{e.message}"
-                sleep 1
-              rescue StandardError => e
-                RubyLLM::MCP.logger.error "Error in stderr thread: #{e.message}"
-                sleep 1
-              end
-            end
+            read_stderr_loop
           end
 
           @stderr_thread.abort_on_exception = true
         end
 
+        def read_stderr_loop
+          while @running
+            begin
+              handle_stderr_read
+            rescue IOError, Errno::EPIPE => e
+              handle_stream_error(e, "Stderr reader")
+              break unless @running
+            rescue StandardError => e
+              RubyLLM::MCP.logger.error "Error in stderr thread: #{e.message}"
+              sleep 1
+            end
+          end
+        end
+
+        def handle_stderr_read
+          if @stderr.closed? || @wait_thread.nil? || !@wait_thread.alive?
+            sleep 1
+            return
+          end
+
+          line = @stderr.gets
+          return unless line && !line.strip.empty?
+
+          RubyLLM::MCP.logger.info(line.strip)
+        end
+
         def process_response(line)
           response = JSON.parse(line)
           request_id = response["id"]&.to_s

data/lib/ruby_llm/mcp/transports/streamable_http.rb

@@ -27,21 +27,6 @@ module RubyLLM
         end
       end
 
-      class OAuthOptions
-        attr_reader :issuer, :client_id, :client_secret, :scope
-
-        def initialize(issuer:, client_id:, client_secret:, scopes:)
-          @issuer = issuer
-          @client_id = client_id
-          @client_secret = client_secret
-          @scope = scopes
-        end
-
-        def enabled?
-          @issuer && @client_id && @client_secret && @scope
-        end
-      end
-
       # Options for starting SSE connections
       class StartSSEOptions
         attr_reader :resumption_token, :on_resumption_token, :replay_message_id
@@ -57,52 +42,52 @@ module RubyLLM
       class StreamableHTTP
         include Support::Timeout
 
-        attr_reader :session_id, :protocol_version, :coordinator
-
-        def initialize( # rubocop:disable Metrics/ParameterLists
-          url:,
-          request_timeout:,
-          coordinator:,
-          headers: {},
-          reconnection: {},
-          version: :http2,
-          oauth: nil,
-          rate_limit: nil,
-          reconnection_options: nil,
-          session_id: nil
-        )
+        attr_reader :session_id, :protocol_version, :coordinator, :oauth_provider
+
+        def initialize(url:, request_timeout:, coordinator:, options: {})
           @url = URI(url)
           @coordinator = coordinator
           @request_timeout = request_timeout
-          @headers = headers || {}
-          @session_id = session_id
 
-          @version = version
-          @reconnection_options = reconnection_options || ReconnectionOptions.new
+          extract_options(options)
+          initialize_state_variables
+          initialize_mutexes
+
+          @connection = create_connection
+
+          RubyLLM::MCP.logger.debug "OAuth provider: #{@oauth_provider ? 'present' : 'none'}" if @oauth_provider
+        end
+
+        def extract_options(options)
+          @headers = options[:headers] || options["headers"] || {}
+          @session_id = options[:session_id] || options["session_id"]
+          @oauth_provider = options[:oauth_provider] || options["oauth_provider"]
+          @version = options[:version] || options["version"] || :http2
           @protocol_version = nil
-          @session_id = session_id
 
-          @resource_metadata_url = nil
-          @client_id = SecureRandom.uuid
+          reconnection = options[:reconnection] || options["reconnection"] || {}
+          @reconnection_options = options[:reconnection_options] || ReconnectionOptions.new(**reconnection)
 
-          @reconnection_options = ReconnectionOptions.new(**reconnection)
-          @oauth_options = OAuthOptions.new(**oauth) unless oauth.nil?
+          rate_limit = options[:rate_limit] || options["rate_limit"]
           @rate_limiter = Support::RateLimiter.new(**rate_limit) if rate_limit
+        end
 
+        def initialize_state_variables
+          @resource_metadata_url = nil
+          @client_id = SecureRandom.uuid
           @id_counter = 0
-          @id_mutex = Mutex.new
           @pending_requests = {}
-          @pending_mutex = Mutex.new
           @running = true
           @abort_controller = nil
           @sse_thread = nil
-          @sse_mutex = Mutex.new
-
-          # Thread-safe collection of all HTTPX clients
           @clients = []
-          @clients_mutex = Mutex.new
+        end
 
-          @connection = create_connection
+        def initialize_mutexes
+          @id_mutex = Mutex.new
+          @pending_mutex = Mutex.new
+          @sse_mutex = Mutex.new
+          @clients_mutex = Mutex.new
         end
 
         def request(body, add_id: true, wait_for_response: true)
@@ -242,17 +227,6 @@ module RubyLLM
             }
           )
 
-          if @oauth_options&.enabled?
-            client = client.plugin(:oauth).oauth_auth(
-              issuer: @oauth_options.issuer,
-              client_id: @oauth_options.client_id,
-              client_secret: @oauth_options.client_secret,
-              scope: @oauth_options.scope
-            )
-
-            client.with_access_token
-          end
-
           register_client(client)
         end
 
@@ -262,7 +236,25 @@ module RubyLLM
           headers["mcp-session-id"] = @session_id if @session_id
           headers["mcp-protocol-version"] = @protocol_version if @protocol_version
           headers["X-CLIENT-ID"] = @client_id
-          headers["Origin"] = @uri.to_s
+          headers["Origin"] = @url.to_s
+
+          # Apply OAuth authorization if available
+          if @oauth_provider
+            RubyLLM::MCP.logger.debug "OAuth provider present, attempting to get token..."
+            RubyLLM::MCP.logger.debug "  Server URL: #{@oauth_provider.server_url}"
+
+            token = @oauth_provider.access_token
+            if token
+              headers["Authorization"] = token.to_header
+              RubyLLM::MCP.logger.debug "✓ Applied OAuth authorization header: #{token.to_header[0..30]}..."
+            else
+              RubyLLM::MCP.logger.warn "✗ OAuth provider present but no valid token available!"
+              RubyLLM::MCP.logger.warn "  This means the token is not in storage or has expired"
+              RubyLLM::MCP.logger.warn "  Check that authentication completed successfully"
+            end
+          else
+            RubyLLM::MCP.logger.debug "No OAuth provider configured for this transport"
+          end
 
           headers
         end
@@ -320,16 +312,6 @@ module RubyLLM
             }
           )
 
-          if @oauth_options&.enabled?
-            client = client.plugin(:oauth).oauth_auth(
-              issuer: @oauth_options.issuer,
-              client_id: @oauth_options.client_id,
-              client_secret: @oauth_options.client_secret,
-              scope: @oauth_options.scope
-            )
-
-            client.with_access_token
-          end
           register_client(client)
         end
 
@@ -348,8 +330,12 @@ module RubyLLM
             handle_accepted_response(original_message)
           when 404
             handle_session_expired
-          when 405, 401
-            # TODO: Implement 401 handling this once we are adding authorization
+          when 401
+            raise Errors::AuthenticationRequiredError.new(
+              message: "OAuth authentication required. Server returned 401 Unauthorized.",
+              code: 401
+            )
+          when 405
             # Method not allowed - acceptable for some endpoints
             nil
           when 400...500
@@ -405,23 +391,38 @@ module RubyLLM
         end
 
         def handle_client_error(response)
+          response_body = response.respond_to?(:body) ? response.body.to_s : "Unknown error"
+          status_code = response.respond_to?(:status) ? response.status : "Unknown"
+
           begin
-            # Safely access response body
-            response_body = response.respond_to?(:body) ? response.body.to_s : "Unknown error"
             error_body = JSON.parse(response_body)
 
             if error_body.is_a?(Hash) && error_body["error"]
-              error_message = error_body["error"]["message"] || error_body["error"]["code"]
+              error_message = error_body["error"]["message"] || error_body["error"]["code"] || error_body["error"].to_s
+
+              # If we still don't have a message, include the full error object
+              if error_message.to_s.strip.empty?
+                error_message = "Empty error (full response: #{response_body})"
+              end
 
               if error_message.to_s.downcase.include?("session")
                 raise Errors::TransportError.new(
-                  code: response.status,
+                  code: status_code,
                   message: "Server error: #{error_message} (Current session ID: #{@session_id || 'none'})"
                 )
               end
 
+              # Special handling for 403 Forbidden with OAuth
+              if status_code == 403 && @oauth_provider
+                raise Errors::TransportError.new(
+                  code: status_code,
+                  message: "Authorization failed (403 Forbidden): #{error_message}. \
+                    Check token scope and resource permissions at #{@oauth_provider.server_url}."
+                )
+              end
+
               raise Errors::TransportError.new(
-                code: response.status,
+                code: status_code,
                 message: "Server error: #{error_message}"
               )
             end
@@ -429,10 +430,6 @@ module RubyLLM
             # Fall through to generic error
           end
 
-          # Safely access response attributes
-          response_body = response.respond_to?(:body) ? response.body.to_s : "Unknown error"
-          status_code = response.respond_to?(:status) ? response.status : "Unknown"
-
           raise Errors::TransportError.new(
             code: status_code,
             message: "HTTP client error: #{status_code} - #{response_body}"
@@ -492,7 +489,12 @@ module RubyLLM
               # SSE stream established successfully
               RubyLLM::MCP.logger.debug "SSE stream established"
               # Response will be processed through callbacks
-            when 405, 401
+            when 401
+              raise Errors::AuthenticationRequiredError.new(
+                message: "OAuth authentication required. Server returned 401 Unauthorized.",
+                code: 401
+              )
+            when 405
               # Server doesn't support SSE - this is acceptable
               RubyLLM::MCP.logger.info "Server does not support SSE streaming"
               nil

data/lib/ruby_llm/mcp/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLLM
   module MCP
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/lib/ruby_llm/mcp.rb

@@ -61,10 +61,10 @@ module RubyLLM
       tools.uniq(&:name)
     end
 
-    def support_complex_parameters!
-      warn "[DEPRECATION] RubyLLM::MCP.support_complex_parameters! is no longer needed " \
-           "and will be removed in version 0.8.0"
-      # No-op: Complex parameters are now supported by default
+    def mcp_configurations
+      config.mcp_configuration.each_with_object({}) do |config, acc|
+        acc[config[:name]] = config
+      end
     end
 
     def configure
@@ -92,5 +92,11 @@ loader.inflector.inflect("sse" => "SSE")
 loader.inflector.inflect("openai" => "OpenAI")
 loader.inflector.inflect("streamable_http" => "StreamableHTTP")
 loader.inflector.inflect("http_client" => "HTTPClient")
+loader.inflector.inflect("oauth_provider" => "OAuthProvider")
+loader.inflector.inflect("browser_oauth" => "BrowserOAuth")
+loader.inflector.inflect("browser_oauth_provider" => "BrowserOAuthProvider")
+loader.inflector.inflect("http_server" => "HttpServer")
+loader.inflector.inflect("callback_handler" => "CallbackHandler")
+loader.inflector.inflect("callback_server" => "CallbackServer")
 
 loader.setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm-mcp
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Patrick Vice
@@ -78,12 +78,46 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/generators/ruby_llm/mcp/install_generator.rb
-- lib/generators/ruby_llm/mcp/templates/initializer.rb
-- lib/generators/ruby_llm/mcp/templates/mcps.yml
+- lib/generators/ruby_llm/mcp/install/install_generator.rb
+- lib/generators/ruby_llm/mcp/install/templates/initializer.rb
+- lib/generators/ruby_llm/mcp/install/templates/mcps.yml
+- lib/generators/ruby_llm/mcp/oauth/install_generator.rb
+- lib/generators/ruby_llm/mcp/oauth/templates/concerns/mcp_token_storage.rb.tt
+- lib/generators/ruby_llm/mcp/oauth/templates/concerns/user_mcp_oauth_concern.rb.tt
+- lib/generators/ruby_llm/mcp/oauth/templates/controllers/mcp_connections_controller.rb.tt
+- lib/generators/ruby_llm/mcp/oauth/templates/jobs/cleanup_expired_oauth_states_job.rb.tt
+- lib/generators/ruby_llm/mcp/oauth/templates/jobs/example_job.rb.tt
+- lib/generators/ruby_llm/mcp/oauth/templates/lib/mcp_client.rb.tt
+- lib/generators/ruby_llm/mcp/oauth/templates/migrations/create_mcp_oauth_credentials.rb.tt
+- lib/generators/ruby_llm/mcp/oauth/templates/migrations/create_mcp_oauth_states.rb.tt
+- lib/generators/ruby_llm/mcp/oauth/templates/models/mcp_oauth_credential.rb.tt
+- lib/generators/ruby_llm/mcp/oauth/templates/models/mcp_oauth_state.rb.tt
+- lib/generators/ruby_llm/mcp/oauth/templates/views/index.html.erb
+- lib/generators/ruby_llm/mcp/oauth/templates/views/show.html.erb
 - lib/ruby_llm/chat.rb
 - lib/ruby_llm/mcp.rb
 - lib/ruby_llm/mcp/attachment.rb
+- lib/ruby_llm/mcp/auth.rb
+- lib/ruby_llm/mcp/auth/browser/callback_handler.rb
+- lib/ruby_llm/mcp/auth/browser/callback_server.rb
+- lib/ruby_llm/mcp/auth/browser/http_server.rb
+- lib/ruby_llm/mcp/auth/browser/opener.rb
+- lib/ruby_llm/mcp/auth/browser/pages.rb
+- lib/ruby_llm/mcp/auth/browser_oauth_provider.rb
+- lib/ruby_llm/mcp/auth/client_registrar.rb
+- lib/ruby_llm/mcp/auth/discoverer.rb
+- lib/ruby_llm/mcp/auth/flows/authorization_code_flow.rb
+- lib/ruby_llm/mcp/auth/flows/client_credentials_flow.rb
+- lib/ruby_llm/mcp/auth/grant_strategies/authorization_code.rb
+- lib/ruby_llm/mcp/auth/grant_strategies/base.rb
+- lib/ruby_llm/mcp/auth/grant_strategies/client_credentials.rb
+- lib/ruby_llm/mcp/auth/http_response_handler.rb
+- lib/ruby_llm/mcp/auth/memory_storage.rb
+- lib/ruby_llm/mcp/auth/oauth_provider.rb
+- lib/ruby_llm/mcp/auth/security.rb
+- lib/ruby_llm/mcp/auth/session_manager.rb
+- lib/ruby_llm/mcp/auth/token_manager.rb
+- lib/ruby_llm/mcp/auth/url_builder.rb
 - lib/ruby_llm/mcp/client.rb
 - lib/ruby_llm/mcp/completion.rb
 - lib/ruby_llm/mcp/configuration.rb
@@ -145,7 +179,7 @@ metadata:
   homepage_uri: https://www.rubyllm-mcp.com
   source_code_uri: https://github.com/patvice/ruby_llm-mcp
   changelog_uri: https://github.com/patvice/ruby_llm-mcp/commits/main
-  documentation_uri: https://www.rubyllm-mcp.com
+  documentation_uri: https://www.rubyllm-mcp.com/guides/
   bug_tracker_uri: https://github.com/patvice/ruby_llm-mcp/issues
   rubygems_mfa_required: 'true'
   allowed_push_host: https://rubygems.org
@@ -163,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A RubyLLM MCP Client
 test_files: []