actionmcp 0.32.1 → 0.50.0

data/lib/action_mcp/server/solid_cable_adapter.rb

@@ -0,0 +1,222 @@
+# frozen_string_literal: true
+
+require "securerandom"
+require "concurrent/map"
+require "concurrent/array"
+require "concurrent/executor/thread_pool_executor"
+
+module ActionMCP
+  module Server
+    # Mock SolidCable::PubSub for testing
+    class MockSolidCablePubSub
+      attr_reader :subscriptions, :messages
+
+      def initialize(options = {})
+        @options = options
+        @subscriptions = Concurrent::Map.new
+        @messages = Concurrent::Array.new
+      end
+
+      def subscribe(channel, &block)
+        @subscriptions[channel] ||= Concurrent::Array.new
+        @subscriptions[channel] << block
+      end
+
+      def unsubscribe(channel)
+        @subscriptions.delete(channel)
+      end
+
+      def broadcast(channel, message)
+        @messages << { channel: channel, message: message }
+        callbacks = @subscriptions[channel] || []
+        callbacks.each { |callback| callback.call(message) }
+      end
+    end
+
+    # Adapter for SolidCable PubSub
+    class SolidCableAdapter
+      # Thread pool configuration
+      DEFAULT_MIN_THREADS = 5
+      DEFAULT_MAX_THREADS = 10
+      DEFAULT_MAX_QUEUE = 100
+      DEFAULT_THREAD_TIMEOUT = 60  # seconds
+
+      def initialize(options = {})
+        @options = options
+        @subscriptions = Concurrent::Map.new
+        @channels = Concurrent::Map.new
+        @channel_subscribed = Concurrent::Map.new  # Track channel subscription status
+
+        # Initialize thread pool for callbacks
+        pool_options = {
+          min_threads: options["min_threads"] || DEFAULT_MIN_THREADS,
+          max_threads: options["max_threads"] || DEFAULT_MAX_THREADS,
+          max_queue: options["max_queue"] || DEFAULT_MAX_QUEUE,
+          fallback_policy: :caller_runs, # Execute in the caller's thread if queue is full
+          idletime: DEFAULT_THREAD_TIMEOUT
+        }
+        @thread_pool = Concurrent::ThreadPoolExecutor.new(pool_options)
+
+        # Configure SolidCable with options from mcp.yml
+        # The main option we care about is polling_interval
+        pubsub_options = {}
+
+        if @options["polling_interval"]
+          # Convert from ActiveSupport::Duration if needed (e.g., "0.1.seconds")
+          interval = @options["polling_interval"]
+          interval = interval.to_f if interval.respond_to?(:to_f)
+          pubsub_options[:polling_interval] = interval
+        end
+
+        # If there's a connects_to option, pass it along
+        if @options["connects_to"]
+          pubsub_options[:connects_to] = @options["connects_to"]
+        end
+
+        # Use mock version for testing or real version in production
+        if defined?(SolidCable) && !testing?
+          @solid_cable_pubsub = SolidCable::PubSub.new(pubsub_options)
+        else
+          @solid_cable_pubsub = MockSolidCablePubSub.new(pubsub_options)
+        end
+      end
+
+      # Subscribe to a channel
+      # @param channel [String] The channel name
+      # @param message_callback [Proc] Callback for received messages
+      # @param success_callback [Proc] Callback for successful subscription
+      # @return [String] Subscription ID
+      def subscribe(channel, message_callback, success_callback = nil)
+        subscription_id = SecureRandom.uuid
+
+        @subscriptions[subscription_id] = {
+          channel: channel,
+          message_callback: message_callback
+        }
+
+        @channels[channel] ||= Concurrent::Array.new
+        @channels[channel] << subscription_id
+
+        # Subscribe to SolidCable only if we haven't already subscribed to this channel
+        unless subscribed_to_solid_cable?(channel)
+          @solid_cable_pubsub.subscribe(channel) do |message|
+            dispatch_message(channel, message)
+          end
+          @channel_subscribed[channel] = true
+        end
+
+        log_subscription_event(channel, "Subscribed", subscription_id)
+        success_callback&.call
+
+        subscription_id
+      end
+
+      # Unsubscribe from a channel
+      # @param channel [String] The channel name
+      # @param callback [Proc] Optional callback for unsubscribe completion
+      def unsubscribe(channel, callback = nil)
+        # Remove our subscriptions
+        subscription_ids = @channels[channel] || []
+        subscription_ids.each do |subscription_id|
+          @subscriptions.delete(subscription_id)
+        end
+
+        @channels.delete(channel)
+
+        # Only unsubscribe from SolidCable if we're actually subscribed
+        if subscribed_to_solid_cable?(channel)
+          @solid_cable_pubsub.unsubscribe(channel)
+          @channel_subscribed.delete(channel)
+        end
+
+        log_subscription_event(channel, "Unsubscribed")
+        callback&.call
+      end
+
+      # Broadcast a message to a channel
+      # @param channel [String] The channel name
+      # @param message [String] The message to broadcast
+      def broadcast(channel, message)
+        @solid_cable_pubsub.broadcast(channel, message)
+        log_broadcast_event(channel, message)
+      end
+
+      # Check if a channel has subscribers
+      # @param channel [String] The channel name
+      # @return [Boolean] True if channel has subscribers
+      def has_subscribers?(channel)
+        subscribers = @channels[channel]
+        return false unless subscribers
+        !subscribers.empty?
+      end
+
+      # Check if we're already subscribed to a channel
+      # @param channel [String] The channel name
+      # @return [Boolean] True if we're already subscribed
+      def subscribed_to?(channel)
+        channel_subs = @channels[channel]
+        return false if channel_subs.nil?
+        !channel_subs.empty?
+      end
+
+      # Shut down the thread pool gracefully
+      def shutdown
+        @thread_pool.shutdown
+        @thread_pool.wait_for_termination(5) # Wait up to 5 seconds for tasks to complete
+      end
+
+      private
+
+      # Check if we're in a testing environment
+      def testing?
+        defined?(Minitest) || ENV["RAILS_ENV"] == "test"
+      end
+
+      # Check if we're already subscribed to this channel in SolidCable
+      def subscribed_to_solid_cable?(channel)
+        @channel_subscribed[channel] == true
+      end
+
+      def dispatch_message(channel, message)
+        subscription_ids = @channels[channel] || []
+
+        subscription_ids.each do |subscription_id|
+          subscription = @subscriptions[subscription_id]
+          next unless subscription && subscription[:message_callback]
+
+          @thread_pool.post do
+            begin
+              subscription[:message_callback].call(message)
+            rescue StandardError => e
+              log_error("Error in message callback: #{e.message}\n#{e.backtrace.join("\n")}")
+            end
+          end
+        end
+      end
+
+      def log_subscription_event(channel, action, subscription_id = nil)
+        return unless defined?(Rails) && Rails.respond_to?(:logger)
+
+        message = "SolidCableAdapter: #{action} channel=#{channel}"
+        message += " subscription_id=#{subscription_id}" if subscription_id
+
+        Rails.logger.debug(message)
+      end
+
+      def log_broadcast_event(channel, message)
+        return unless defined?(Rails) && Rails.respond_to?(:logger)
+
+        # Truncate the message for logging
+        truncated_message = message.to_s[0..100]
+        truncated_message += "..." if message.to_s.length > 100
+
+        Rails.logger.debug("SolidCableAdapter: Broadcasting to channel=#{channel} message=#{truncated_message}")
+      end
+
+      def log_error(message)
+        return unless defined?(Rails) && Rails.respond_to?(:logger)
+        Rails.logger.error("SolidCableAdapter: #{message}")
+      end
+    end
+  end
+end

data/lib/action_mcp/server.rb

@@ -1,13 +1,95 @@
 # frozen_string_literal: true
 
-# TODO: move all server related code here before version 1.0.0
+require_relative "server/simple_pub_sub"
+require_relative "server/configuration"
+
+# Conditionally load adapters based on available gems
+begin
+  require "solid_cable/pubsub"
+  require_relative "server/solid_cable_adapter"
+rescue LoadError
+  # SolidCable not available
+end
+
 module ActionMCP
   # Module for server-related functionality.
   module Server
     module_function
 
     def server
-      @server ||= ActionCable::Server::Base.new
+      @server ||= ServerBase.new
+    end
+
+    # Shut down the server and clean up resources
+    def shutdown
+      return unless @server
+      @server.shutdown
+      @server = nil
+    end
+
+    # Available pubsub adapter types
+    ADAPTERS = {
+      "test" => "SimplePubSub",
+      "simple" => "SimplePubSub",
+      "solid_cable" => "SolidCableAdapter" # Will use mock version in tests
+    }.compact.freeze
+
+    # Custom server base class for PubSub functionality
+    class ServerBase
+      def initialize(config_path = nil)
+        @configuration = Configuration.new(config_path)
+      end
+
+      def pubsub
+        @pubsub ||= create_pubsub
+      end
+
+      # Allow manual override of the configuration
+      # @param config_path [String] Path to a cable.yml configuration file
+      def configure(config_path)
+        shutdown_pubsub if @pubsub
+        @configuration = Configuration.new(config_path)
+        @pubsub = nil  # Reset pubsub so it will be recreated with new config
+      end
+
+      # Gracefully shut down the server and its resources
+      def shutdown
+        shutdown_pubsub
+      end
+
+      private
+
+      # Shut down the pubsub adapter gracefully
+      def shutdown_pubsub
+        return unless @pubsub && @pubsub.respond_to?(:shutdown)
+
+        begin
+          @pubsub.shutdown
+        rescue => e
+          message = "Error shutting down pubsub adapter: #{e.message}"
+          Rails.logger.error(message) if defined?(Rails) && Rails.respond_to?(:logger)
+        ensure
+          @pubsub = nil
+        end
+      end
+
+      def create_pubsub
+        adapter_name = @configuration.adapter_name
+        adapter_options = @configuration.adapter_options
+
+        # Default to simple if adapter not found
+        adapter_class_name = ADAPTERS[adapter_name] || "SimplePubSub"
+
+        begin
+          # Create an instance of the adapter class with the configuration options
+          adapter_class = ActionMCP::Server.const_get(adapter_class_name)
+          adapter_class.new(adapter_options)
+        rescue NameError, LoadError => e
+          message = "Error creating adapter #{adapter_name}: #{e.message}"
+          Rails.logger.error(message) if defined?(Rails) && Rails.respond_to?(:logger)
+          SimplePubSub.new  # Fallback to simple pubsub
+        end
+      end
     end
   end
 end

data/lib/action_mcp/sse_listener.rb

@@ -4,7 +4,7 @@ require "concurrent/atomic/atomic_boolean"
 require "concurrent/promise"
 
 module ActionMCP
-  # Listener class to subscribe to session messages via Action Cable adapter.
+  # Listener class to subscribe to session messages via PubSub adapter.
   class SSEListener
     delegate :session_key, :adapter, to: :@session
 
@@ -15,7 +15,7 @@ module ActionMCP
       @subscription_active = Concurrent::AtomicBoolean.new
     end
 
-    # Start listening using ActionCable's adapter
+    # Start listening using PubSub adapter
     # @yield [Hash] Yields parsed message received from the pub/sub channel
     # @return [Boolean] True if subscription was successful within timeout, false otherwise.
     def start(&callback)
@@ -30,7 +30,7 @@ module ActionMCP
         process_message(raw_message, callback)
       }
 
-      # Subscribe using the ActionCable adapter
+      # Subscribe using the PubSub adapter
       adapter.subscribe(session_key, message_callback, success_callback)
 
       wait_for_subscription

data/lib/action_mcp/tool.rb

@@ -60,14 +60,10 @@ module ActionMCP
         annotate(:readOnly, enabled)
       end
 
-      # Return annotations based on protocol version
+      # Return annotations for the tool
       def annotations_for_protocol(protocol_version = nil)
-        # Only include annotations for 2025+ protocols
-        if protocol_version.nil? || protocol_version == "2024-11-05"
-          {}
-        else
-          _annotations
-        end
+        # Always include annotations now that we only support 2025+
+        _annotations
       end
     end
 

data/lib/action_mcp/version.rb

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

data/lib/action_mcp.rb

@@ -34,9 +34,9 @@ module ActionMCP
   require_relative "action_mcp/version"
   require_relative "action_mcp/client"
   include Logging
-  PROTOCOL_VERSION = "2024-11-05"  # Default version
-  CURRENT_VERSION = "2025-03-26"   # Current version for the /mcp endpoint
-  SUPPORTED_VERSIONS = %w[2024-11-05 2025-03-26].freeze
+  PROTOCOL_VERSION = "2025-03-26"  # Default version
+  CURRENT_VERSION = "2025-03-26"   # Current version
+  SUPPORTED_VERSIONS = %w[2025-03-26].freeze
   class << self
     delegate :server, to: "ActionMCP::Server"
     # Returns the configuration instance.

data/lib/generators/action_mcp/config/config_generator.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ActionMCP
+  module Generators
+    class ConfigGenerator < Rails::Generators::Base
+      source_root File.expand_path("templates", __dir__)
+
+      desc "Creates ActionMCP configuration file (config/mcp.yml)"
+
+      def create_mcp_yml
+        template "mcp.yml", "config/mcp.yml"
+      end
+
+      def show_instructions
+        say "ActionMCP configuration file created at config/mcp.yml"
+        say "You can customize your PubSub adapters and other settings in this file."
+        say ""
+        say "Available adapters:"
+        say "  - simple   : In-memory adapter for development"
+        say "  - test     : Test adapter"
+        say "  - solid_cable : Database-backed adapter (requires solid_cable gem)"
+        say "  - redis    : Redis-backed adapter (requires redis gem)"
+        say ""
+        say "Example usage:"
+        say "  rails g action_mcp:install  # Main generator"
+      end
+    end
+  end
+end

data/lib/generators/action_mcp/config/templates/mcp.yml

@@ -0,0 +1,36 @@
+# ActionMCP Configuration
+# This file contains configuration for the ActionMCP pub/sub system.
+# Different environments can use different adapters.
+
+development:
+  # In-memory adapter for development
+  adapter: simple
+  # Thread pool configuration (optional)
+  # min_threads: 5     # Minimum number of threads in the pool
+  # max_threads: 10    # Maximum number of threads in the pool
+  # max_queue: 100     # Maximum number of tasks that can be queued
+
+test:
+  # Test adapter for testing
+  adapter: test
+
+production:
+  # Choose one of the following adapters:
+  
+  # 1. Database-backed adapter (recommended)
+  adapter: solid_cable
+  polling_interval: 0.5.seconds
+  # connects_to: cable  # Optional: specify a different database connection
+  
+  # Thread pool configuration (optional)
+  min_threads: 10     # Minimum number of threads in the pool
+  max_threads: 20     # Maximum number of threads in the pool
+  max_queue: 500      # Maximum number of tasks that can be queued
+
+  # 2. Redis-backed adapter (alternative)
+  # adapter: redis
+  # url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  # channel_prefix: <%= Rails.application.class.module_parent_name.underscore %>_production
+  # min_threads: 10    # Minimum number of threads in the pool
+  # max_threads: 20    # Maximum number of threads in the pool
+  # max_queue: 500     # Maximum number of tasks that can be queued

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmcp
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.50.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,20 +9,6 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: actioncable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 8.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 8.0.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +79,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 description: It offers base classes and helpers for creating MCP applications, making
   it easier to integrate your Ruby/Rails application with the MCP standard
 email:
@@ -106,8 +106,6 @@ files:
 - README.md
 - Rakefile
 - app/controllers/action_mcp/mcp_controller.rb
-- app/controllers/action_mcp/messages_controller.rb
-- app/controllers/action_mcp/sse_controller.rb
 - app/controllers/action_mcp/unified_controller.rb
 - app/models/action_mcp.rb
 - app/models/action_mcp/application_record.rb
@@ -119,14 +117,7 @@ files:
 - app/models/concerns/mcp_console_helpers.rb
 - app/models/concerns/mcp_message_inspect.rb
 - config/routes.rb
-- db/migrate/20250308122801_create_action_mcp_sessions.rb
-- db/migrate/20250314230152_add_is_ping_to_session_message.rb
-- db/migrate/20250316005021_create_action_mcp_session_subscriptions.rb
-- db/migrate/20250316005649_create_action_mcp_session_resources.rb
-- db/migrate/20250324203409_remove_session_message_text.rb
-- db/migrate/20250327124131_add_sse_event_counter_to_action_mcp_sessions.rb
-- db/migrate/20250329120300_add_registries_to_sessions.rb
-- db/migrate/20250329150312_create_action_mcp_sse_events.rb
+- db/migrate/20250512154359_consolidated_migration.rb
 - exe/actionmcp_cli
 - lib/action_mcp.rb
 - lib/action_mcp/base_response.rb
@@ -147,7 +138,6 @@ files:
 - 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
@@ -177,6 +167,7 @@ files:
 - lib/action_mcp/resource_templates_registry.rb
 - lib/action_mcp/server.rb
 - lib/action_mcp/server/capabilities.rb
+- lib/action_mcp/server/configuration.rb
 - lib/action_mcp/server/json_rpc_handler.rb
 - lib/action_mcp/server/messaging.rb
 - lib/action_mcp/server/notifications.rb
@@ -186,6 +177,8 @@ files:
 - lib/action_mcp/server/roots.rb
 - lib/action_mcp/server/sampling.rb
 - lib/action_mcp/server/sampling_request.rb
+- lib/action_mcp/server/simple_pub_sub.rb
+- lib/action_mcp/server/solid_cable_adapter.rb
 - lib/action_mcp/server/tools.rb
 - lib/action_mcp/server/transport_handler.rb
 - lib/action_mcp/sse_listener.rb
@@ -199,6 +192,8 @@ files:
 - lib/action_mcp/uri_ambiguity_checker.rb
 - lib/action_mcp/version.rb
 - lib/actionmcp.rb
+- lib/generators/action_mcp/config/config_generator.rb
+- lib/generators/action_mcp/config/templates/mcp.yml
 - lib/generators/action_mcp/install/install_generator.rb
 - lib/generators/action_mcp/install/templates/application_mcp_prompt.rb
 - lib/generators/action_mcp/install/templates/application_mcp_res_template.rb

data/app/controllers/action_mcp/messages_controller.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module ActionMCP
-  class MessagesController < MCPController
-    REQUIRED_PROTOCOL_VERSION = "2024-11-05"
-
-    include Instrumentation::ControllerRuntime
-
-    # @route POST / (sse_in)
-    def create
-      handle_post_message(params, response)
-      head response.status
-    end
-
-    private
-
-    def transport_handler
-      Server::TransportHandler.new(mcp_session)
-    end
-
-    def json_rpc_handler
-      @json_rpc_handler ||= Server::JsonRpcHandler.new(transport_handler)
-    end
-
-    def handle_post_message(params, response)
-      filtered_params = filter_jsonrpc_params(params)
-      json_rpc_handler.call(filtered_params)
-      response.status = :accepted
-    rescue StandardError => _e
-      response.status = :bad_request
-    end
-
-    def mcp_session
-      @mcp_session ||= Session.find_or_create_by(id: params[:session_id])
-    end
-
-    def filter_jsonrpc_params(params)
-      # Valid JSON-RPC keys (both request and response)
-      valid_keys = %w[jsonrpc method params id result error]
-
-      params.to_h.slice(*valid_keys)
-    end
-  end
-end