actionmcp 0.19.1 → 0.22.0

data/lib/action_mcp/server/json_rpc_handler.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module ActionMCP
+  module Server
+    class JsonRpcHandler < JsonRpcHandlerBase
+      protected
+
+      # Handle server-specific methods
+      # @param rpc_method [String]
+      # @param id [String, Integer]
+      # @param params [Hash]
+      def handle_method(rpc_method, id, params)
+        case rpc_method
+        when "initialize" # [SERVER] Client initializing the connection
+          transport.send_capabilities(id, params)
+        when %r{^prompts/} # Prompt-related requests
+          process_prompts(rpc_method, id, params)
+        when %r{^resources/} # Resource-related requests
+          process_resources(rpc_method, id, params)
+        when %r{^tools/} # Tool-related requests
+          process_tools(rpc_method, id, params)
+        when "completion/complete" # Completion requests
+          process_completion_complete(id, params)
+        else
+          puts "\e[31mUnknown client method: #{rpc_method}\e[0m"
+        end
+      end
+
+      # Server methods (client → server)
+
+      # @param id [String]
+      # @param params [Hash]
+      # @example {
+      #     "ref": {
+      #       "type": "ref/prompt",
+      #       "name": "code_review"
+      #     },
+      #     "argument": {
+      #       "name": "language",
+      #       "value": "py"
+      #     }
+      #   }
+      # @return [Hash]
+      # @example {
+      #     "completion": {
+      #       "values": ["python", "pytorch", "pyside"],
+      #       "total": 10,
+      #       "hasMore": true
+      #     }
+      #   }
+      def process_completion_complete(id, params)
+        # TODO: Not Implemented, but to remove the error message in the inspector
+        transport.send_jsonrpc_response(id, result: { completion: { values: [], total: 0, hasMore: false } })
+        case params["ref"]["type"]
+        when "ref/prompt"
+          # TODO: Implement completion
+        when "ref/resource"
+          # TODO: Implement completion
+        end
+      end
+
+      # @param rpc_method [String]
+      # @param id [String]
+      # @param params [Hash]
+      def process_prompts(rpc_method, id, params)
+        case rpc_method
+        when "prompts/get" # Get specific prompt
+          transport.send_prompts_get(id, params["name"], params["arguments"])
+        when "prompts/list" # List available prompts
+          transport.send_prompts_list(id)
+        else
+          Rails.logger.warn("Unknown prompts method: #{rpc_method}")
+        end
+      end
+
+      # @param rpc_method [String]
+      # @param id [String]
+      # @param params [Hash]
+      def process_tools(rpc_method, id, params)
+        case rpc_method
+        when "tools/list" # List available tools
+          transport.send_tools_list(id)
+        when "tools/call" # Call a tool
+          transport.send_tools_call(id, params["name"], params["arguments"])
+        else
+          Rails.logger.warn("Unknown tools method: #{rpc_method}")
+        end
+      end
+
+      # @param rpc_method [String]
+      # @param id [String]
+      # @param params [Hash]
+      def process_resources(rpc_method, id, params)
+        case rpc_method
+        when "resources/list" # List available resources
+          transport.send_resources_list(id)
+        when "resources/templates/list" # List resource templates
+          transport.send_resource_templates_list(id)
+        when "resources/read" # Read resource content
+          transport.send_resource_read(id, params)
+        when "resources/subscribe" # Subscribe to resource updates
+          transport.send_resource_subscribe(id, params["uri"])
+        when "resources/unsubscribe" # Unsubscribe from resource updates
+          transport.send_resource_unsubscribe(id, params["uri"])
+        else
+          Rails.logger.warn("Unknown resources method: #{rpc_method}")
+        end
+      end
+
+      def process_notifications(rpc_method, params)
+        case rpc_method
+        when "notifications/initialized" # Client initialization complete
+          puts "\e[31mInitialized\e[0m"
+          transport.initialize!
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/action_mcp/server/messaging.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module ActionMCP
+  module Server
+    module Messaging
+      def send_jsonrpc_request(method, params: nil, id: SecureRandom.uuid_v7)
+        request = JsonRpc::Request.new(id: id, method: method, params: params)
+        write_message(request)
+      end
+
+      def send_jsonrpc_response(request_id, result: nil, error: nil)
+        response = JsonRpc::Response.new(id: request_id, result: result, error: error)
+        write_message(response)
+      end
+
+      def send_jsonrpc_notification(method, params = nil)
+        notification = JsonRpc::Notification.new(method: method, params: params)
+        write_message(notification)
+      end
+
+      def send_jsonrpc_error(request_id, symbol, message, data = nil)
+        error = JsonRpc::JsonRpcError.new(symbol, message:, data:)
+        response = JsonRpc::Response.new(id: request_id, error:)
+        write_message(response)
+      end
+    end
+  end
+end

data/lib/action_mcp/{transport → server}/notifications.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActionMCP
-  module Transport
+  module Server
     module Notifications
       # Notify client that the resources list has changed
       def send_resources_list_changed_notification

data/lib/action_mcp/{transport → server}/prompts.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActionMCP
-  module Transport
+  module Server
     module Prompts
       def send_prompts_list(request_id)
         prompts = format_registry_items(PromptsRegistry.non_abstract)

data/lib/action_mcp/{transport → server}/resources.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActionMCP
-  module Transport
+  module Server
     module Resources
       # Send list of available resources to the client
       #
@@ -61,23 +61,6 @@ module ActionMCP
         end
       end
 
-      def send_resource_subscribe(id, uri)
-        session.resource_subscribe(uri)
-        send_jsonrpc_response(id, result: {})
-      end
-
-      def send_resource_unsubscribe(id, uri)
-        session.resource_unsubscribe(uri)
-        send_jsonrpc_response(id, result: {})
-      end
-
-      # Client logging
-      def set_client_logging_level(id, level)
-        # Store the client's preferred log level
-        @client_log_level = level
-        send_jsonrpc_response(id, result: {})
-      end
-
       private
 
       # Log all registered resource templates

data/lib/action_mcp/{transport → server}/roots.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActionMCP
-  module Transport
+  module Server
     module Roots
       def send_roots_list(id)
         send_jsonrpc_response(id, result: { roots: [] })

data/lib/action_mcp/{transport → server}/sampling.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActionMCP
-  module Transport
+  module Server
     module Sampling
       # @param [String] id
       # @param [SamplingRequest] request

data/lib/action_mcp/server/sampling_request.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module ActionMCP
+  module Server
+    class SamplingRequest
+      class << self
+        attr_reader :default_messages, :default_system_prompt, :default_context,
+                    :default_model_hints, :default_intelligence_priority,
+                    :default_max_tokens, :default_temperature
+
+        def configure
+          yield self
+        end
+
+        def messages(messages = nil)
+          if messages
+            @default_messages = messages.map do |msg|
+              mutate_content(msg)
+            end
+          end
+          @messages ||= []
+        end
+
+        def system_prompt(prompt = nil)
+          @default_system_prompt = prompt if prompt
+          @default_system_prompt
+        end
+
+        def include_context(context = nil)
+          @default_context = context if context
+          @default_context
+        end
+
+        def model_hints(hints = nil)
+          @default_model_hints = hints if hints
+          @model_hints ||= []
+        end
+
+        def intelligence_priority(priority = nil)
+          @default_intelligence_priority = priority if priority
+          @intelligence_priority ||= 0.9
+        end
+
+        def max_tokens(tokens = nil)
+          @default_max_tokens = tokens if tokens
+          @max_tokens ||= 500
+        end
+
+        def temperature(temp = nil)
+          @default_temperature = temp if temp
+          @temperature ||= 0.7
+        end
+
+        private
+
+        def mutate_content(msg)
+          content = msg[:content]
+          if content.is_a?(ActionMCP::Content) || (content.respond_to?(:to_h) && !content.is_a?(Hash))
+            { role: msg[:role], content: content.to_h }
+          else
+            msg
+          end
+        end
+      end
+
+      attr_accessor :system_prompt, :model_hints, :intelligence_priority, :max_tokens, :temperature
+      attr_reader :messages, :context
+
+      def initialize
+        @messages = self.class.default_messages.dup
+        @system_prompt = self.class.default_system_prompt
+        @context = self.class.default_context
+        @model_hints = self.class.default_model_hints.dup
+        @intelligence_priority = self.class.default_intelligence_priority
+        @max_tokens = self.class.default_max_tokens
+        @temperature = self.class.default_temperature
+
+        yield self if block_given?
+      end
+
+      def messages=(value)
+        @messages = value.map do |msg|
+          self.class.send(:mutate_content, msg)
+        end
+      end
+
+      def include_context=(value)
+        @context = value
+      end
+
+      def add_message(content, role: "user")
+        if content.is_a?(Content::Base) || (content.respond_to?(:to_h) && !content.is_a?(Hash))
+          @messages << { role: role, content: content.to_h }
+        else
+          content = Content::Text.new(content).to_h if content.is_a?(String)
+          @messages << { role: role, content: content }
+        end
+      end
+
+      def to_h
+        {
+          messages: messages.map { |msg| { role: msg[:role], content: msg[:content] } },
+          systemPrompt: system_prompt,
+          includeContext: context,
+          modelPreferences: {
+            hints: model_hints.map { |name| { name: name } },
+            intelligencePriority: intelligence_priority
+          },
+          maxTokens: max_tokens,
+          temperature: temperature
+        }.compact
+      end
+    end
+  end
+end

data/lib/action_mcp/{transport → server}/tools.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActionMCP
-  module Transport
+  module Server
     module Tools
       def send_tools_list(request_id)
         tools = format_registry_items(ToolsRegistry.non_abstract)

data/lib/action_mcp/server/transport_handler.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module ActionMCP
+  module Server
+    class TransportHandler
+      attr_reader :session
+
+      delegate :initialize!, :initialized?, to: :session
+      delegate :read, :write, to: :session
+      include Logging
+
+      include  Messaging
+      include  Capabilities
+      include  Tools
+      include  Prompts
+      include  Resources
+      include  Notifications
+      include  Sampling
+      include  Roots
+
+      # @param [ActionMCP::Session] session
+      def initialize(session)
+        @session = session
+      end
+
+      def send_pong(request_id)
+        send_jsonrpc_response(request_id, result: {})
+      end
+
+      private
+
+      def write_message(data)
+        session.write(data)
+      end
+
+      def format_registry_items(registry)
+        registry.map { |item| item.klass.to_h }
+      end
+    end
+  end
+end

data/lib/action_mcp/tool_response.rb

@@ -2,15 +2,14 @@
 
 module ActionMCP
   # Manages the collection of content objects for tool results
-  class ToolResponse
-    include Enumerable
-    attr_reader :contents, :is_error
+  class ToolResponse < BaseResponse
+    attr_reader :contents
 
     delegate :empty?, :size, :each, :find, :map, to: :contents
 
     def initialize
+      super
       @contents = []
-      @is_error = false
     end
 
     # Add content to the response
@@ -19,65 +18,21 @@ module ActionMCP
       content # Return the content for chaining
     end
 
-    # Mark response as error
-    def mark_as_error!(symbol = :invalid_request, message: nil, data: nil)
-      @is_error = true
-      @symbol = symbol
-      @error_message = message
-      @error_data = data
-      self
+    # Implementation of build_success_hash for ToolResponse
+    def build_success_hash
+      {
+        content: @contents.map(&:to_h)
+      }
     end
 
-    # Convert to hash format expected by MCP protocol
-    def to_h
-      if @is_error
-        JsonRpc::JsonRpcError.new(@symbol, message: @error_message, data: @error_data).to_h
-      else
-        {
-          content: @contents.map(&:to_h)
-        }
-      end
+    # Implementation of compare_with_same_class for ToolResponse
+    def compare_with_same_class(other)
+      contents == other.contents && is_error == other.is_error
     end
 
-    # Alias as_json to to_h for consistency
-    alias as_json to_h
-
-    # Handle to_json directly
-    def to_json(options = nil)
-      to_h.to_json(options)
-    end
-
-    # Compare with hash for easier testing.
-    def ==(other)
-      case other
-      when Hash
-        # Convert both to normalized format for comparison
-        hash_self = to_h.deep_transform_keys { |key| key.to_s.underscore }
-        hash_other = other.deep_transform_keys { |key| key.to_s.underscore }
-        hash_self == hash_other
-      when ToolResponse
-        contents == other.contents && is_error == other.is_error
-      else
-        super
-      end
-    end
-
-    # Implement eql? for hash key comparison
-    def eql?(other)
-      self == other
-    end
-
-    # Implement hash method for hash key usage
-    def hash
-      [ contents, is_error ].hash
-    end
-
-    def success?
-      !is_error
-    end
-
-    def error?
-      is_error
+    # Implementation of hash_components for ToolResponse
+    def hash_components
+      [ contents, is_error ]
     end
 
     # Pretty print for better debugging

data/lib/action_mcp/uri_ambiguity_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionMCP
   module UriAmbiguityChecker
     extend ActiveSupport::Concern
@@ -17,9 +19,7 @@ module ActionMCP
         segments2 = pattern2.split("/")
 
         # If different number of segments, they can't be ambiguous
-        if segments1.size != segments2.size
-          return false
-        end
+        return false if segments1.size != segments2.size
 
         # Extract literals (non-parameters) from each pattern
         literals1 = []
@@ -34,14 +34,12 @@ module ActionMCP
         end
 
         # Check each segment for direct literal mismatches
-        segments1.zip(segments2).each_with_index do |(seg1, seg2), index|
+        segments1.zip(segments2).each_with_index do |(seg1, seg2), _index|
           param1 = parameter?(seg1)
           param2 = parameter?(seg2)
 
           # When both segments are literals, they must match exactly
-          if !param1 && !param2 && seg1 != seg2
-            return false
-          end
+          return false if !param1 && !param2 && seg1 != seg2
         end
 
         # Check for structural incompatibility in the literals
@@ -60,9 +58,7 @@ module ActionMCP
             common_literal_indices2 = common_literals.map { |lit| lit_values2.index(lit) }
 
             # If the relative ordering is different, patterns are not ambiguous
-            if common_literal_indices1 != common_literal_indices2
-              return false
-            end
+            return false if common_literal_indices1 != common_literal_indices2
           end
         end
 

data/lib/action_mcp/version.rb

@@ -2,7 +2,7 @@
 
 require_relative "gem_version"
 module ActionMCP
-  VERSION = "0.19.1"
+  VERSION = "0.22.0"
 
   class << self
     alias version gem_version

data/lib/action_mcp.rb

@@ -30,6 +30,7 @@ end.setup
 
 module ActionMCP
   require_relative "action_mcp/version"
+  require_relative "action_mcp/client"
   include Logging
   PROTOCOL_VERSION = "2024-11-05"
 
@@ -86,6 +87,6 @@ module ActionMCP
   ActiveModel::Type.register(:integer_array, IntegerArray)
 end
 
-ActiveSupport.on_load(:action_mcp) do
+ActiveSupport.on_load(:action_mcp, run_once: true) do
   self.logger = ::Rails.logger
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmcp
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-23 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 8.0.1
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -122,11 +108,25 @@ files:
 - db/migrate/20250316005649_create_action_mcp_session_resources.rb
 - exe/actionmcp_cli
 - lib/action_mcp.rb
-- lib/action_mcp/base_json_rpc_handler.rb
+- lib/action_mcp/base_response.rb
 - lib/action_mcp/callbacks.rb
 - lib/action_mcp/capability.rb
 - lib/action_mcp/client.rb
-- lib/action_mcp/client_json_rpc_handler.rb
+- lib/action_mcp/client/base.rb
+- lib/action_mcp/client/blueprint.rb
+- lib/action_mcp/client/catalog.rb
+- lib/action_mcp/client/json_rpc_handler.rb
+- lib/action_mcp/client/logging.rb
+- lib/action_mcp/client/messaging.rb
+- lib/action_mcp/client/prompt_book.rb
+- lib/action_mcp/client/prompts.rb
+- lib/action_mcp/client/resources.rb
+- lib/action_mcp/client/roots.rb
+- lib/action_mcp/client/server.rb
+- lib/action_mcp/client/sse_client.rb
+- lib/action_mcp/client/stdio_client.rb
+- lib/action_mcp/client/toolbox.rb
+- lib/action_mcp/client/tools.rb
 - lib/action_mcp/configuration.rb
 - lib/action_mcp/content.rb
 - lib/action_mcp/content/audio.rb
@@ -144,7 +144,7 @@ files:
 - lib/action_mcp/json_rpc/notification.rb
 - lib/action_mcp/json_rpc/request.rb
 - lib/action_mcp/json_rpc/response.rb
-- lib/action_mcp/json_rpc_handler.rb
+- lib/action_mcp/json_rpc_handler_base.rb
 - lib/action_mcp/log_subscriber.rb
 - lib/action_mcp/logging.rb
 - lib/action_mcp/prompt.rb
@@ -156,27 +156,24 @@ files:
 - lib/action_mcp/resource_callbacks.rb
 - lib/action_mcp/resource_template.rb
 - lib/action_mcp/resource_templates_registry.rb
-- lib/action_mcp/sampling_request.rb
 - lib/action_mcp/server.rb
-- lib/action_mcp/server_json_rpc_handler.rb
+- lib/action_mcp/server/capabilities.rb
+- lib/action_mcp/server/json_rpc_handler.rb
+- lib/action_mcp/server/messaging.rb
+- lib/action_mcp/server/notifications.rb
+- lib/action_mcp/server/prompts.rb
+- lib/action_mcp/server/resources.rb
+- lib/action_mcp/server/roots.rb
+- lib/action_mcp/server/sampling.rb
+- lib/action_mcp/server/sampling_request.rb
+- lib/action_mcp/server/tools.rb
+- lib/action_mcp/server/transport_handler.rb
 - lib/action_mcp/string_array.rb
 - lib/action_mcp/test_helper.rb
 - lib/action_mcp/tool.rb
 - lib/action_mcp/tool_response.rb
 - lib/action_mcp/tools_registry.rb
 - lib/action_mcp/transport.rb
-- lib/action_mcp/transport/capabilities.rb
-- lib/action_mcp/transport/messaging.rb
-- lib/action_mcp/transport/notifications.rb
-- lib/action_mcp/transport/prompts.rb
-- lib/action_mcp/transport/resources.rb
-- lib/action_mcp/transport/roots.rb
-- lib/action_mcp/transport/sampling.rb
-- lib/action_mcp/transport/sse_client.rb
-- lib/action_mcp/transport/stdio_client.rb
-- lib/action_mcp/transport/tools.rb
-- lib/action_mcp/transport/transport_base.rb
-- lib/action_mcp/transport_handler.rb
 - lib/action_mcp/uri_ambiguity_checker.rb
 - lib/action_mcp/version.rb
 - lib/actionmcp.rb