actionmcp 0.31.1 → 0.33.0

data/lib/action_mcp/tool.rb

@@ -16,6 +16,7 @@ module ActionMCP
     #   @return [Array<String>] The required properties of the tool.
     class_attribute :_schema_properties, instance_accessor: false, default: {}
     class_attribute :_required_properties, instance_accessor: false, default: []
+    class_attribute :_annotations, instance_accessor: false, default: {}
 
     # --------------------------------------------------------------------------
     # Tool Name and Description DSL
@@ -45,6 +46,29 @@ module ActionMCP
       def type
         :tool
       end
+
+      def annotate(key, value)
+        self._annotations = _annotations.merge(key.to_s => value)
+      end
+
+      # Convenience methods for common annotations
+      def destructive(enabled = true)
+        annotate(:destructive, enabled)
+      end
+
+      def read_only(enabled = true)
+        annotate(:readOnly, enabled)
+      end
+
+      # Return annotations based on protocol version
+      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
+      end
     end
 
     # --------------------------------------------------------------------------
@@ -114,14 +138,21 @@ module ActionMCP
     # Returns a hash representation of the tool definition including its JSON Schema.
     #
     # @return [Hash] The tool definition.
-    def self.to_h
+    def self.to_h(protocol_version: nil)
       schema = { type: "object", properties: _schema_properties }
       schema[:required] = _required_properties if _required_properties.any?
-      {
+
+      result = {
         name: tool_name,
         description: description.presence,
         inputSchema: schema
       }.compact
+
+      # Add annotations if protocol supports them
+      annotations = annotations_for_protocol(protocol_version)
+      result[:annotations] = annotations if annotations.any?
+
+      result
     end
 
     # --------------------------------------------------------------------------
@@ -131,24 +162,29 @@ module ActionMCP
     # Public entry point for executing the tool
     # Returns an array of Content objects collected from render calls
     def call
-      @response = ToolResponse.new # Create a new response for each invocation
+      @response = ToolResponse.new
+      performed = false            # ← track execution
 
-      # Check validations before proceeding
       if valid?
         begin
           run_callbacks :perform do
-            perform # Invoke the subclass-specific logic if valid
+            performed = true       # ← set if we reach the block
+            perform
           end
         rescue StandardError => e
-          # Handle exceptions during execution
           @response.mark_as_error!(:internal_error, message: e.message)
         end
       else
-        # Handle validation failure
-        @response.mark_as_error!(:invalid_request, message: "Invalid input", data: errors.full_messages)
+        @response.mark_as_error!(:invalid_request,
+                                 message: "Invalid input",
+                                 data: errors.full_messages)
       end
 
-      @response # Return the response with collected content
+      # If callbacks halted execution (`performed` still false) and
+      # nothing else marked an error, surface it as invalid_request.
+      @response.mark_as_error!(:invalid_request, message: "Aborted by callback") if !performed && !@response.error?
+
+      @response
     end
 
     def inspect

data/lib/action_mcp/version.rb

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

data/lib/action_mcp.rb

@@ -34,11 +34,11 @@ module ActionMCP
   require_relative "action_mcp/version"
   require_relative "action_mcp/client"
   include Logging
-  PROTOCOL_VERSION = "2024-11-05"
-
+  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
   class << self
-    attr_accessor :server
-
+    delegate :server, to: "ActionMCP::Server"
     # Returns the configuration instance.
     #
     # @return [Configuration] 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,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: actionmcp
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.33.0
 platform: ruby
 authors:
 - Abdelkader Boudih
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: actioncable
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,19 +24,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 8.0.1
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: jsonrpc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.0.1
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.0.1
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +80,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: jsonrpc-rails
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        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:
@@ -115,7 +114,10 @@ files:
 - app/models/action_mcp/session.rb
 - app/models/action_mcp/session/message.rb
 - app/models/action_mcp/session/resource.rb
+- app/models/action_mcp/session/sse_event.rb
 - app/models/action_mcp/session/subscription.rb
+- 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
@@ -123,6 +125,8 @@ files:
 - 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
 - exe/actionmcp_cli
 - lib/action_mcp.rb
 - lib/action_mcp/base_response.rb
@@ -147,6 +151,7 @@ files:
 - lib/action_mcp/client/toolbox.rb
 - lib/action_mcp/client/tools.rb
 - lib/action_mcp/configuration.rb
+- lib/action_mcp/console_detector.rb
 - lib/action_mcp/content.rb
 - lib/action_mcp/content/audio.rb
 - lib/action_mcp/content/image.rb
@@ -172,18 +177,23 @@ 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
 - lib/action_mcp/server/prompts.rb
+- lib/action_mcp/server/registry_management.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/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
 - lib/action_mcp/string_array.rb
+- lib/action_mcp/tagged_stream_logging.rb
 - lib/action_mcp/test_helper.rb
 - lib/action_mcp/tool.rb
 - lib/action_mcp/tool_response.rb
@@ -192,6 +202,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
@@ -212,7 +224,6 @@ metadata:
   source_code_uri: https://github.com/seuros/action_mcp
   changelog_uri: https://github.com/seuros/action_mcp/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -227,8 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Provides essential tooling for building Model Context Protocol (MCP) capable
   servers