ruby_llm-mcp 0.2.1 → 0.3.1

data/lib/ruby_llm/mcp/transport/sse.rb

@@ -12,9 +12,10 @@ module RubyLLM
       class SSE
         attr_reader :headers, :id
 
-        def initialize(url, headers: {})
+        def initialize(url, headers: {}, request_timeout: 8000)
           @event_url = url
           @messages_url = nil
+          @request_timeout = request_timeout
 
           uri = URI.parse(url)
           @root_url = "#{uri.scheme}://#{uri.host}"
@@ -40,8 +41,7 @@ module RubyLLM
           start_sse_listener
         end
 
-        # rubocop:disable Metrics/MethodLength
-        def request(body, add_id: true, wait_for_response: true)
+        def request(body, add_id: true, wait_for_response: true) # rubocop:disable Metrics/MethodLength
           # Generate a unique request ID
           if add_id
             @id_mutex.synchronize { @id_counter += 1 }
@@ -60,7 +60,7 @@ module RubyLLM
           # Send the request using Faraday
           begin
             conn = Faraday.new do |f|
-              f.options.timeout = 30
+              f.options.timeout = @request_timeout / 1000
               f.options.open_timeout = 5
             end
 
@@ -83,15 +83,20 @@ module RubyLLM
           return unless wait_for_response
 
           begin
-            Timeout.timeout(30) do
+            Timeout.timeout(@request_timeout / 1000) do
               response_queue.pop
             end
           rescue Timeout::Error
             @pending_mutex.synchronize { @pending_requests.delete(request_id.to_s) }
-            raise RubyLLM::MCP::Errors::TimeoutError.new(message: "Request timed out after 30 seconds")
+            raise RubyLLM::MCP::Errors::TimeoutError.new(
+              message: "Request timed out after #{@request_timeout / 1000} seconds"
+            )
           end
         end
-        # rubocop:enable Metrics/MethodLength
+
+        def alive?
+          @running
+        end
 
         def close
           @running = false

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

@@ -11,7 +11,8 @@ module RubyLLM
       class Stdio
         attr_reader :command, :stdin, :stdout, :stderr, :id
 
-        def initialize(command, args: [], env: {})
+        def initialize(command, request_timeout:, args: [], env: {})
+          @request_timeout = request_timeout
           @command = command
           @args = args
           @env = env || {}
@@ -23,6 +24,7 @@ module RubyLLM
           @pending_mutex = Mutex.new
           @running = true
           @reader_thread = nil
+          @stderr_thread = nil
 
           start_process
         end
@@ -53,16 +55,22 @@ module RubyLLM
           return unless wait_for_response
 
           begin
-            Timeout.timeout(30) do
+            Timeout.timeout(@request_timeout / 1000) do
               response_queue.pop
             end
           rescue Timeout::Error
             @pending_mutex.synchronize { @pending_requests.delete(request_id.to_s) }
-            raise RubyLLM::MCP::Errors::TimeoutError.new(message: "Request timed out after 30 seconds")
+            raise RubyLLM::MCP::Errors::TimeoutError.new(
+              message: "Request timed out after #{@request_timeout / 1000} seconds"
+            )
           end
         end
 
-        def close
+        def alive?
+          @running
+        end
+
+        def close # rubocop:disable Metrics/MethodLength
           @running = false
 
           begin
@@ -82,6 +90,7 @@ module RubyLLM
           rescue StandardError
             nil
           end
+
           begin
             @stderr&.close
           rescue StandardError
@@ -94,11 +103,18 @@ module RubyLLM
             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
         end
 
         private
@@ -109,10 +125,11 @@ module RubyLLM
           @stdin, @stdout, @stderr, @wait_thread = if @env.empty?
                                                      Open3.popen3(@command, *@args)
                                                    else
-                                                     Open3.popen3(environment_string, @command, *@args)
+                                                     Open3.popen3(@env, @command, *@args)
                                                    end
 
           start_reader_thread
+          start_stderr_thread
         end
 
         def restart_process
@@ -148,12 +165,34 @@ module RubyLLM
           @reader_thread.abort_on_exception = true
         end
 
-        def process_response(line)
-          response = begin
-            JSON.parse(line)
-          rescue JSON::ParserError => e
-            raise "Error parsing response as JSON: #{e.message}\nRaw response: #{line}"
+        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?
+
+                puts "STDERR: #{line.strip}"
+              rescue IOError, Errno::EPIPE => e
+                puts "Stderr reader error: #{e.message}"
+                sleep 1
+              rescue StandardError => e
+                puts "Error in stderr thread: #{e.message}"
+                sleep 1
+              end
+            end
           end
+
+          @stderr_thread.abort_on_exception = true
+        end
+
+        def process_response(line)
+          response = JSON.parse(line)
           request_id = response["id"]&.to_s
 
           @pending_mutex.synchronize do
@@ -162,10 +201,8 @@ module RubyLLM
               response_queue&.push(response)
             end
           end
-        end
-
-        def environment_string
-          @env.map { |key, value| "#{key}=#{value}" }.join(" ")
+        rescue JSON::ParserError => e
+          RubyLLM.logger.error("Error parsing response as JSON: #{e.message}\nRaw response: #{line}")
         end
       end
     end

data/lib/ruby_llm/mcp/transport/streamable.rb

@@ -12,8 +12,9 @@ module RubyLLM
       class Streamable
         attr_reader :headers, :id, :session_id
 
-        def initialize(url, headers: {})
+        def initialize(url, request_timeout:, headers: {})
           @url = url
+          @request_timeout = request_timeout
           @client_id = SecureRandom.uuid
           @session_id = nil
           @base_headers = headers.merge({
@@ -55,6 +56,10 @@ module RubyLLM
           handle_response(response, request_id, response_queue, wait_for_response)
         end
 
+        def alive?
+          @running
+        end
+
         def close
           @running = false
           @sse_mutex.synchronize do
@@ -83,7 +88,7 @@ module RubyLLM
 
         def create_connection
           Faraday.new(url: @url) do |f|
-            f.options.timeout = 300
+            f.options.timeout = @request_timeout / 1000
             f.options.open_timeout = 10
           end
         end
@@ -279,12 +284,14 @@ module RubyLLM
         end
 
         def wait_for_response_with_timeout(request_id, response_queue)
-          Timeout.timeout(30) do
+          Timeout.timeout(@request_timeout / 1000) do
             response_queue.pop
           end
         rescue Timeout::Error
           @pending_mutex.synchronize { @pending_requests.delete(request_id.to_s) }
-          raise RubyLLM::MCP::Errors::TimeoutError.new(message: "Request timed out after 30 seconds")
+          raise RubyLLM::MCP::Errors::TimeoutError.new(
+            message: "Request timed out after #{@request_timeout / 1000} seconds"
+          )
         end
       end
     end

data/lib/ruby_llm/mcp/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLLM
   module MCP
-    VERSION = "0.2.1"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm-mcp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Patrick Vice
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-17 00:00:00.000000000 Z
+date: 2025-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -114,15 +114,18 @@ files:
 - lib/ruby_llm/mcp/client.rb
 - lib/ruby_llm/mcp/completion.rb
 - lib/ruby_llm/mcp/content.rb
+- lib/ruby_llm/mcp/coordinator.rb
 - lib/ruby_llm/mcp/errors.rb
 - lib/ruby_llm/mcp/parameter.rb
 - lib/ruby_llm/mcp/prompt.rb
 - lib/ruby_llm/mcp/providers/anthropic/complex_parameter_support.rb
+- lib/ruby_llm/mcp/providers/gemini/complex_parameter_support.rb
 - lib/ruby_llm/mcp/providers/openai/complex_parameter_support.rb
 - lib/ruby_llm/mcp/requests/base.rb
-- lib/ruby_llm/mcp/requests/completion.rb
+- lib/ruby_llm/mcp/requests/completion_prompt.rb
+- lib/ruby_llm/mcp/requests/completion_resource.rb
 - lib/ruby_llm/mcp/requests/initialization.rb
-- lib/ruby_llm/mcp/requests/notification.rb
+- lib/ruby_llm/mcp/requests/initialize_notification.rb
 - lib/ruby_llm/mcp/requests/prompt_call.rb
 - lib/ruby_llm/mcp/requests/prompt_list.rb
 - lib/ruby_llm/mcp/requests/resource_list.rb
@@ -131,6 +134,7 @@ files:
 - lib/ruby_llm/mcp/requests/tool_call.rb
 - lib/ruby_llm/mcp/requests/tool_list.rb
 - lib/ruby_llm/mcp/resource.rb
+- lib/ruby_llm/mcp/resource_template.rb
 - lib/ruby_llm/mcp/tool.rb
 - lib/ruby_llm/mcp/transport/sse.rb
 - lib/ruby_llm/mcp/transport/stdio.rb