actionmcp 0.71.1 → 0.72.0

data/lib/action_mcp/server/tools.rb

@@ -10,7 +10,7 @@ module ActionMCP
 
         # Send initial progress notification if token is provided
         if progress_token
-          session.send_progress_notification(
+          send_progress_notification(
             progressToken: progress_token,
             progress: 0,
             message: "Starting tools list retrieval"
@@ -26,7 +26,7 @@ module ActionMCP
 
         # Send completion progress notification if token is provided
         if progress_token
-          session.send_progress_notification(
+          send_progress_notification(
             progressToken: progress_token,
             progress: 100,
             message: "Tools list retrieval complete"
@@ -40,51 +40,70 @@ module ActionMCP
         # Find tool in session's registry
         tool_class = session.registered_tools.find { |t| t.tool_name == tool_name }
 
-        if tool_class
-          begin
-            # Create tool and set execution context with request info
-            tool = tool_class.new(arguments)
-            tool.with_context({
-              session: session,
-              request: {
-                params: {
-                  name: tool_name,
-                  arguments: arguments,
-                  _meta: _meta
-                }
-              }
-            })
+        unless tool_class
+          Rails.logger.error "Tool not found: #{tool_name}. Registered tools: #{session.registered_tools.map(&:tool_name).join(', ')}"
+          send_jsonrpc_error(request_id, :method_not_found,
+                             "Tool '#{tool_name}' not found or not registered for this session")
+          return
+        end
+
+        # Check if tool requires consent and if consent is granted
+        if tool_class.respond_to?(:requires_consent?) && tool_class.requires_consent? && !session.consent_granted_for?(tool_name)
+          # Use custom error response for consent required (-32002)
+          error = {
+            code: -32_002,
+            message: "Consent required for tool '#{tool_name}'"
+          }
+          send_jsonrpc_response(request_id, error: error)
+          return
+        end
 
-            # Wrap tool execution with Rails reloader for development
-            result = if Rails.env.development?
-              # Preserve Current attributes across reloader boundary
-              current_user = ActionMCP::Current.user
-              current_gateway = ActionMCP::Current.gateway
+        begin
+          # Create tool and set execution context with request info
+          tool = tool_class.new(arguments)
+          tool.with_context({
+                              session: session,
+                              request: {
+                                params: {
+                                  name: tool_name,
+                                  arguments: arguments,
+                                  _meta: _meta
+                                }
+                              }
+                            })
 
-              Rails.application.reloader.wrap do
-                # Restore Current attributes inside reloader
-                ActionMCP::Current.user = current_user
-                ActionMCP::Current.gateway = current_gateway
-                tool.call
-              end
-            else
-              tool.call
-            end
+          # Wrap tool execution with Rails reloader for development
+          result = if Rails.env.development?
+                     # Preserve Current attributes across reloader boundary
+                     current_user = ActionMCP::Current.user
+                     current_gateway = ActionMCP::Current.gateway
+
+                     Rails.application.reloader.wrap do
+                       # Restore Current attributes inside reloader
+                       ActionMCP::Current.user = current_user
+                       ActionMCP::Current.gateway = current_gateway
+                       tool.call
+                     end
+          else
+                     tool.call
+          end
 
-            if result.is_error
-              # Convert ToolResponse error to proper JSON-RPC error format
-              # Pass the error hash directly - the Response class will handle it
-              error_hash = result.to_h
-              send_jsonrpc_response(request_id, error: error_hash)
-            else
-              send_jsonrpc_response(request_id, result: result)
-            end
-          rescue ArgumentError => e
-            # Handle parameter validation errors
-            send_jsonrpc_error(request_id, :invalid_params, e.message)
+          if result.is_error
+            # Convert ToolResponse error to proper JSON-RPC error format
+            # Pass the error hash directly - the Response class will handle it
+            error_hash = result.to_h
+            send_jsonrpc_response(request_id, error: error_hash)
+          else
+            send_jsonrpc_response(request_id, result: result)
           end
-        else
-          send_jsonrpc_error(request_id, :method_not_found, "Tool '#{tool_name}' not available in this session")
+        rescue ArgumentError => e
+          # Handle parameter validation errors
+          send_jsonrpc_error(request_id, :invalid_params, e.message)
+        rescue StandardError => e
+          # Log the actual error for debugging
+          Rails.logger.error "Tool execution error: #{e.class} - #{e.message}"
+          Rails.logger.error e.backtrace.join("\n")
+          send_jsonrpc_error(request_id, :internal_error, "An unexpected error occurred.")
         end
       end
 

data/lib/action_mcp/server/transport_handler.rb

@@ -12,17 +12,15 @@ module ActionMCP
       delegate :read, :write, to: :session
       include Logging
 
-      include  BaseMessaging  # Provides basic write_message
-      include  Messaging
+      include  MessagingService
       include  Capabilities
       include  Tools
       include  Prompts
       include  Resources
-      include  Notifications
       include  Sampling
       include  Roots
       include  Elicitation
-      include  ResponseCollector  # Must be included last to override write_message
+      include  ResponseCollector # Must be included last to override write_message
 
       # @param [ActionMCP::Session] session
       # @param messaging_mode [:write, :return] The mode for message handling

data/lib/action_mcp/server/volatile_session_store.rb

@@ -27,99 +27,7 @@ module ActionMCP
     # documentation, tell them it's just "technical comments for developers."
     # They'll believe anything that sounds boring enough.
     #
-    class VolatileSessionStore
-      include SessionStore
-
-      def initialize
-        @sessions = Concurrent::Hash.new
-      end
-
-      def create_session(session_id = nil, attributes = {})
-        session_id ||= SecureRandom.hex(6)
-
-        session_data = {
-          id: session_id,
-          status: "pre_initialize",
-          initialized: false,
-          role: "server",
-          messages_count: 0,
-          sse_event_counter: 0,
-          created_at: Time.current,
-          updated_at: Time.current
-        }.merge(attributes)
-
-        session = MemorySession.new(session_data, self)
-
-        # Initialize server info and capabilities if server role
-        if session.role == "server"
-          session.server_info = {
-            name: ActionMCP.configuration.name,
-            version: ActionMCP.configuration.version
-          }
-          session.server_capabilities = ActionMCP.configuration.capabilities
-
-          # Initialize registries
-          session.tool_registry = ActionMCP.configuration.filtered_tools.map(&:name)
-          session.prompt_registry = ActionMCP.configuration.filtered_prompts.map(&:name)
-          session.resource_registry = ActionMCP.configuration.filtered_resources.map(&:name)
-        end
-
-        @sessions[session_id] = session
-        session
-      end
-
-      def load_session(session_id)
-        session = @sessions[session_id]
-        if session
-          session.instance_variable_set(:@new_record, false)
-        end
-        session
-      end
-
-      def save_session(session)
-        @sessions[session.id] = session
-      end
-
-      def delete_session(session_id)
-        @sessions.delete(session_id)
-      end
-
-      def session_exists?(session_id)
-        @sessions.key?(session_id)
-      end
-
-      def find_sessions(criteria = {})
-        sessions = @sessions.values
-
-        # Filter by status
-        if criteria[:status]
-          sessions = sessions.select { |s| s.status == criteria[:status] }
-        end
-
-        # Filter by role
-        if criteria[:role]
-          sessions = sessions.select { |s| s.role == criteria[:role] }
-        end
-
-        sessions
-      end
-
-      def cleanup_expired_sessions(older_than: 24.hours.ago)
-        expired_ids = @sessions.select do |_id, session|
-          session.updated_at < older_than
-        end.keys
-
-        expired_ids.each { |id| @sessions.delete(id) }
-        expired_ids.count
-      end
-
-      def clear_all
-        @sessions.clear
-      end
-
-      def session_count
-        @sessions.size
-      end
+    class VolatileSessionStore < BaseSessionStore
     end
   end
 end

data/lib/action_mcp/tagged_stream_logging.rb

@@ -35,9 +35,9 @@ module ActionMCP
     private
 
     # Helper method to handle tagged logging across different logger types
-    def log_with_tags(*tags)
+    def log_with_tags(*tags, &block)
       if ActionMCP.logger.respond_to?(:tagged)
-        ActionMCP.logger.tagged(*tags) { yield }
+        ActionMCP.logger.tagged(*tags, &block)
       else
         # For loggers that don't support tagging (like BroadcastLogger),
         # prepend tags to the message

data/lib/action_mcp/test_helper/progress_notification_assertions.rb

@@ -79,10 +79,10 @@ module ActionMCP
                  "total must be numeric when present"
         end
 
-        if params.key?(:message)
-          assert params[:message].is_a?(String),
-                 "message must be string when present"
-        end
+        return unless params.key?(:message)
+
+        assert params[:message].is_a?(String),
+               "message must be string when present"
       end
 
       # Get the current session store (with helpful error if not using test store)

data/lib/action_mcp/test_helper/session_store_assertions.rb

@@ -114,6 +114,7 @@ module ActionMCP
       def server_session_store
         store = ActionMCP::Server.session_store
         raise "Server session store is not a TestSessionStore" unless store.is_a?(ActionMCP::Server::TestSessionStore)
+
         store
       end
 
@@ -121,8 +122,11 @@ module ActionMCP
         # This would need to be set by the test or could use a thread-local variable
         # For now, we'll assume it's available as an instance variable
         store = @client_session_store || Thread.current[:test_client_session_store]
-        raise "Client session store not set. Set @client_session_store or Thread.current[:test_client_session_store]" unless store
+        unless store
+          raise "Client session store not set. Set @client_session_store or Thread.current[:test_client_session_store]"
+        end
         raise "Client session store is not a TestSessionStore" unless store.is_a?(ActionMCP::Client::TestSessionStore)
+
         store
       end
     end

data/lib/action_mcp/tool.rb

@@ -23,6 +23,7 @@ module ActionMCP
     class_attribute :_annotations, instance_accessor: false, default: {}
     class_attribute :_output_schema, instance_accessor: false, default: nil
     class_attribute :_meta, instance_accessor: false, default: {}
+    class_attribute :_requires_consent, instance_accessor: false, default: false
 
     # --------------------------------------------------------------------------
     # Tool Name and Description DSL
@@ -44,6 +45,7 @@ module ActionMCP
     # @return [String] The default tool name.
     def self.default_tool_name
       return "" if name.nil?
+
       name.demodulize.underscore.sub(/_tool$/, "")
     end
 
@@ -128,20 +130,31 @@ module ActionMCP
       def output_schema(schema = nil)
         if schema
           raise NotImplementedError, "Output schema DSL not yet implemented. Coming soon with structured content DSL!"
-        else
-          _output_schema
         end
+
+        _output_schema
       end
 
       # Sets or retrieves the _meta field
       def meta(data = nil)
         if data
           raise ArgumentError, "_meta must be a hash" unless data.is_a?(Hash)
+
           self._meta = _meta.merge(data)
         else
           _meta
         end
       end
+
+      # Marks this tool as requiring consent before execution
+      def requires_consent!
+        self._requires_consent = true
+      end
+
+      # Returns whether this tool requires consent
+      def requires_consent?
+        _requires_consent
+      end
     end
 
     # --------------------------------------------------------------------------
@@ -203,21 +216,19 @@ module ActionMCP
 
       # Map the type - for number arrays, use our custom type instance
       mapped_type = if type == "number"
-        Types::FloatArrayType.new
+                      Types::FloatArrayType.new
       else
-        map_json_type_to_active_model_type("array_#{type}")
+                      map_json_type_to_active_model_type("array_#{type}")
       end
 
       attribute prop_name, mapped_type, default: default
 
       # For arrays, we need to check if the attribute is nil, not if it's empty
-      if required
-        validates prop_name, presence: true, unless: -> { self.send(prop_name).is_a?(Array) }
-        validate do
-          if self.send(prop_name).nil?
-            errors.add(prop_name, "can't be blank")
-          end
-        end
+      return unless required
+
+      validates prop_name, presence: true, unless: -> { send(prop_name).is_a?(Array) }
+      validate do
+        errors.add(prop_name, "can't be blank") if send(prop_name).nil?
       end
     end
 
@@ -277,7 +288,13 @@ module ActionMCP
             perform
           end
         rescue StandardError => e
-          @response.mark_as_error!(:internal_error, message: e.message)
+          # Show generic error message for HTTP requests, detailed for direct calls
+          error_message = if execution_context[:request].present?
+                            "An unexpected error occurred."
+          else
+                            e.message
+          end
+          @response.mark_as_error!(:internal_error, message: error_message)
         end
       else
         @response.mark_as_error!(:invalid_params,
@@ -345,12 +362,10 @@ module ActionMCP
       return unless @response
 
       # Validate against output schema if defined
-      if self.class._output_schema
-        # TODO: Add JSON Schema validation here
-        # For now, just ensure it's a hash/object
-        unless content.is_a?(Hash)
-          raise ArgumentError, "Structured content must be a hash/object when output_schema is defined"
-        end
+      # TODO: Add JSON Schema validation here
+      # For now, just ensure it's a hash/object
+      if self.class._output_schema && !content.is_a?(Hash)
+        raise ArgumentError, "Structured content must be a hash/object when output_schema is defined"
       end
 
       @response.set_structured_content(content)
@@ -408,30 +423,26 @@ module ActionMCP
     def validate_number_parameter(key, value)
       return if value.is_a?(Numeric)
 
-      if value.is_a?(String)
-        # Check if string can be converted to a valid number
-        begin
-          Float(value)
-        rescue ArgumentError, TypeError
-          raise ArgumentError, "Parameter '#{key}' must be a valid number, got: #{value.inspect}"
-        end
-      else
-        raise ArgumentError, "Parameter '#{key}' must be a number, got: #{value.class}"
+      raise ArgumentError, "Parameter '#{key}' must be a number, got: #{value.class}" unless value.is_a?(String)
+
+      # Check if string can be converted to a valid number
+      begin
+        Float(value)
+      rescue ArgumentError, TypeError
+        raise ArgumentError, "Parameter '#{key}' must be a valid number, got: #{value.inspect}"
       end
     end
 
     def validate_integer_parameter(key, value)
       return if value.is_a?(Integer)
 
-      if value.is_a?(String)
-        # Check if string can be converted to a valid integer
-        begin
-          Integer(value)
-        rescue ArgumentError, TypeError
-          raise ArgumentError, "Parameter '#{key}' must be a valid integer, got: #{value.inspect}"
-        end
-      else
-        raise ArgumentError, "Parameter '#{key}' must be an integer, got: #{value.class}"
+      raise ArgumentError, "Parameter '#{key}' must be an integer, got: #{value.class}" unless value.is_a?(String)
+
+      # Check if string can be converted to a valid integer
+      begin
+        Integer(value)
+      rescue ArgumentError, TypeError
+        raise ArgumentError, "Parameter '#{key}' must be a valid integer, got: #{value.inspect}"
       end
     end
 
@@ -447,7 +458,7 @@ module ActionMCP
       raise ArgumentError, "Parameter '#{key}' must be a boolean, got: #{value.class}"
     end
 
-    def validate_array_parameter(key, value, property_schema)
+    def validate_array_parameter(key, value, _property_schema)
       return if value.is_a?(Array)
 
       raise ArgumentError, "Parameter '#{key}' must be an array, got: #{value.class}"

data/lib/action_mcp/types/float_array_type.rb

@@ -25,10 +25,12 @@ module ActionMCP
             when "nan"
               Float::NAN
             else
-              Float(v) rescue nil
+              begin
+                Float(v)
+              rescue StandardError
+                nil
+              end
             end
-          else
-            nil
           end
         end.compact
       end

data/lib/action_mcp/version.rb

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

data/lib/action_mcp.rb

@@ -45,7 +45,7 @@ module ActionMCP
   ].freeze
 
   LATEST_VERSION = SUPPORTED_VERSIONS.first.freeze
-  DEFAULT_PROTOCOL_VERSION = "2025-03-26".freeze  # Default to initial stable version for backwards compatibility
+  DEFAULT_PROTOCOL_VERSION = "2025-03-26" # Default to initial stable version for backwards compatibility
   class << self
     # Returns a Rack-compatible application for serving MCP requests
     # This makes ActionMCP.server work similar to ActionCable.server

data/lib/generators/action_mcp/install/templates/application_gateway.rb

@@ -31,6 +31,7 @@ class ApplicationGateway < ActionMCP::Gateway
   # Example method to resolve user from JWT payload
   def resolve_user(payload)
     return nil unless payload.is_a?(Hash)
+
     user_id = payload["user_id"] || payload["sub"]
     return nil unless user_id
 

data/lib/tasks/action_mcp_tasks.rake

@@ -175,7 +175,7 @@ namespace :action_mcp do
     # Authentication
     puts "\n\e[36mAuthentication:\e[0m"
     puts "  Methods: #{config.authentication_methods.join(', ')}"
-    if config.oauth_config && config.oauth_config.any?
+    if config.oauth_config&.any?
       puts "  OAuth Provider: #{config.oauth_config['provider']}"
       puts "  OAuth Scopes: #{config.oauth_config['scopes_supported']&.join(', ')}"
     end
@@ -236,7 +236,7 @@ namespace :action_mcp do
       total_sessions = ActionMCP::Session.count
       puts "  Total Sessions: #{total_sessions}"
 
-      if total_sessions > 0
+      if total_sessions.positive?
         # Sessions by status
         sessions_by_status = ActionMCP::Session.group(:status).count
         puts "  Sessions by Status:"
@@ -282,7 +282,7 @@ namespace :action_mcp do
         total_messages = ActionMCP::Session::Message.count
         puts "  Total Messages: #{total_messages}"
 
-        if total_messages > 0
+        if total_messages.positive?
           # Messages by direction
           messages_by_direction = ActionMCP::Session::Message.group(:direction).count
           puts "  Messages by Direction:"
@@ -291,7 +291,9 @@ namespace :action_mcp do
           end
 
           # Messages by type
-          messages_by_type = ActionMCP::Session::Message.group(:message_type).count.sort_by { |_type, count| -count }.first(10)
+          messages_by_type = ActionMCP::Session::Message.group(:message_type).count.sort_by do |_type, count|
+            -count
+          end.first(10)
           puts "  Top Message Types:"
           messages_by_type.each do |type, count|
             puts "    #{type}: #{count}"
@@ -316,7 +318,7 @@ namespace :action_mcp do
         total_events = ActionMCP::Session::SSEEvent.count
         puts "  Total SSE Events: #{total_events}"
 
-        if total_events > 0
+        if total_events.positive?
           # Recent events
           recent_events = ActionMCP::Session::SSEEvent.where("created_at > ?", 1.hour.ago).count
           puts "  SSE Events (Last Hour): #{recent_events}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmcp
 version: !ruby/object:Gem::Version
-  version: 0.71.1
+  version: 0.72.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -51,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -93,20 +107,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: jwt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +223,7 @@ files:
 - db/migrate/20250608112101_add_oauth_to_sessions.rb
 - db/migrate/20250708105124_create_action_mcp_oauth_clients.rb
 - db/migrate/20250708105226_create_action_mcp_oauth_tokens.rb
+- db/migrate/20250715070713_add_consents_to_action_mcp_sess.rb
 - exe/actionmcp_cli
 - lib/action_mcp.rb
 - lib/action_mcp/base_response.rb
@@ -303,6 +304,8 @@ files:
 - lib/action_mcp/server.rb
 - lib/action_mcp/server/active_record_session_store.rb
 - lib/action_mcp/server/base_messaging.rb
+- lib/action_mcp/server/base_session.rb
+- lib/action_mcp/server/base_session_store.rb
 - lib/action_mcp/server/capabilities.rb
 - lib/action_mcp/server/configuration.rb
 - lib/action_mcp/server/elicitation.rb
@@ -310,11 +313,10 @@ files:
 - lib/action_mcp/server/error_handling.rb
 - lib/action_mcp/server/handlers/prompt_handler.rb
 - lib/action_mcp/server/handlers/resource_handler.rb
+- lib/action_mcp/server/handlers/router.rb
 - lib/action_mcp/server/handlers/tool_handler.rb
 - lib/action_mcp/server/json_rpc_handler.rb
-- lib/action_mcp/server/memory_session.rb
-- lib/action_mcp/server/messaging.rb
-- lib/action_mcp/server/notifications.rb
+- lib/action_mcp/server/messaging_service.rb
 - lib/action_mcp/server/prompts.rb
 - lib/action_mcp/server/registry_management.rb
 - lib/action_mcp/server/resources.rb