actionmcp 0.201.0 → 0.201.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43c9c7b1a96891c28d29f5c3c9e292d6eed0404540f0bc5c32b502c5d617106
-  data.tar.gz: 806b9bec986aa74568aca0a9fc5959f1734638297f0c4318e2d4d324ffe0455b
+  metadata.gz: 49402a02736231ce65b7851e94d98550eb0dac2b605d8e469b4907ae886677db
+  data.tar.gz: 69432a9e6a7ccfaf557a3eca2fc44136d3f2a658fa46bb30b9c0e119cf9cde2a
 SHA512:
-  metadata.gz: 1a3bcc5e984b69d10826170410506ea996f26a145552fbc608b228e72b1c6787370bbe7d5c1a3d6967a6f1c2a72b0f520a1e9566067a207ab33a46caab4722e7
-  data.tar.gz: 7f15b59458d2fd70bcc86cd8ef545b12a0ad4467523a72a4461d664ae2610d10305c89355414e450adf5d479a97aa2d583bbc36085ba7a3696d872fc5d187ad7
+  metadata.gz: 7687741dd8be7cdeac36a500154dfd2a9441c352ce0c2be1524f3dedbfe4c75ada593022e82f933b316070f73ffac112fa0c7f291ba67d24f335784cc187f1bd
+  data.tar.gz: 87a0ae3173f26f09a0e323e24649b691341683ec77dbd1ab1602dcca15eb7570bba043150c8c9764c21dad6a27ca9ee6178b73f622f2231eb424b31625191424

data/lib/action_mcp/apps/view_manifest.rb

@@ -82,13 +82,13 @@ module ActionMCP
           end
 
           generated.concat(ResourceTemplate.registered_templates.select { |klass| generated_template?(klass) })
-          generated.concat(ResourceTemplatesRegistry.items.values.select { |klass| generated_template?(klass) })
+          generated.concat(ResourceTemplatesRegistry.store.values.select { |klass| generated_template?(klass) })
           generated.uniq!
 
           ResourceTemplate.registered_templates.delete_if do |klass|
             generated.include?(klass) || generated_template?(klass)
           end
-          ResourceTemplatesRegistry.items.delete_if do |_name, klass|
+          ResourceTemplatesRegistry.store.delete_if do |_name, klass|
             generated.include?(klass) || generated_template?(klass)
           end
 
@@ -139,7 +139,7 @@ module ActionMCP
             end
           end
 
-          ResourceTemplatesRegistry.items.delete_if { |_key, registered| registered.equal?(klass) }
+          ResourceTemplatesRegistry.store.delete_if { |_key, registered| registered.equal?(klass) }
           ResourceTemplatesRegistry.register(klass)
 
           [ klass, logical_uri, uri ]

data/lib/action_mcp/configuration.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "monitor"
 require_relative "gateway"
 
 module ActionMCP
@@ -107,6 +108,8 @@ module ActionMCP
       # Browser origins allowed to reach a local server. Remote deployments must
       # explicitly add their trusted origin hosts.
       @allowed_origins = %w[localhost 127.0.0.1 ::1].freeze
+
+      @mcp_components_monitor = Monitor.new
     end
 
     def name
@@ -340,21 +343,55 @@ module ActionMCP
     end
 
     def eager_load_if_needed
-      profile = @profiles[active_profile]
-      return unless profile
+      ensure_mcp_components_loaded if mcp_components_load_needed?
+    end
+
+    # Loading app/mcp inside initialize! drags every model the tools reference into boot.
+    def prepare_mcp_components
+      if defer_mcp_components_load?
+        @mcp_components_state = (:deferred if mcp_components_load_needed?)
+      else
+        @mcp_components_state = nil
+        eager_load_if_needed
+      end
+    end
+
+    def mcp_components_deferred?
+      @mcp_components_state == :deferred
+    end
 
-      # Check if any component type includes "all"
-      needs_eager_load = profile[:tools]&.include?("all") ||
-                         profile[:prompts]&.include?("all") ||
-                         profile[:resources]&.include?("all")
+    # Reentrant Monitor: the load registers (and may read) through the registries on this thread.
+    def load_deferred_mcp_components
+      return unless @mcp_components_state
 
-      return unless needs_eager_load
+      @mcp_components_monitor.synchronize do
+        next unless @mcp_components_state == :deferred
 
-      ensure_mcp_components_loaded
+        @mcp_components_state = :loading
+        begin
+          ensure_mcp_components_loaded
+          @mcp_components_state = nil
+        ensure
+          @mcp_components_state = :deferred if @mcp_components_state == :loading
+        end
+      end
     end
 
     private
 
+    def defer_mcp_components_load?
+      !Rails.configuration.eager_load && !Rails.application.initialized?
+    end
+
+    def mcp_components_load_needed?
+      profile = @profiles[active_profile]
+      return false unless profile
+
+      profile[:tools]&.include?("all") ||
+        profile[:prompts]&.include?("all") ||
+        profile[:resources]&.include?("all")
+    end
+
     def default_profiles
       {
         primary: {

data/lib/action_mcp/engine.rb

@@ -50,9 +50,9 @@ module ActionMCP
         ActionMCP::PromptsRegistry.clear!
       end
 
-      # Eager load MCP components if profile includes "all"
-      # This runs after Zeitwerk is fully set up
-      ActionMCP.configuration.eager_load_if_needed
+      # Eager load MCP components if profile includes "all". Booting without
+      # eager loading defers them to the first registry read instead.
+      ActionMCP.configuration.prepare_mcp_components
 
       # Register compiled MCP Apps views after registries
       # are (re)built. Runs on each dev reload so rebuilt view bundles/hashes

data/lib/action_mcp/prompt.rb

@@ -56,7 +56,7 @@ module ActionMCP
       end
 
       def unregister_from_registry
-        ActionMCP::PromptsRegistry.unregister(self) if ActionMCP::PromptsRegistry.items.values.include?(self)
+        ActionMCP::PromptsRegistry.unregister(self) if ActionMCP::PromptsRegistry.store.values.include?(self)
       end
 
       # Hook called when a class inherits from Prompt

data/lib/action_mcp/registry_base.rb

@@ -7,13 +7,21 @@ module ActionMCP
     class NotFound < StandardError; end
 
     class << self
-      # Returns all registered items.
+      # Raw storage for writes: registering never triggers the deferred component load.
       #
       # @return [Hash] A hash of registered items.
-      def items
+      def store
         @items ||= {}
       end
 
+      # Returns all registered items, running a deferred component load first.
+      #
+      # @return [Hash] A hash of registered items.
+      def items
+        ActionMCP.configuration.load_deferred_mcp_components
+        store
+      end
+
       # Register an item explicitly
       #
       # @param klass [Class] The class to register
@@ -22,7 +30,7 @@ module ActionMCP
         return if klass.abstract?
 
         name = klass.capability_name
-        items[name] = klass
+        store[name] = klass
         klass._registered_name = name if klass.respond_to?(:_registered_name=)
       end
 
@@ -38,11 +46,11 @@ module ActionMCP
         new_name = klass.capability_name
 
         # Remove old entry if it exists and points to this class
-        if old_name && items[old_name] == klass
-          items.delete(old_name)
+        if old_name && store[old_name] == klass
+          store.delete(old_name)
         end
 
-        items[new_name] = klass
+        store[new_name] = klass
         klass._registered_name = new_name if klass.respond_to?(:_registered_name=)
       end
 
@@ -51,7 +59,7 @@ module ActionMCP
       # @param klass [Class] The class to unregister
       # @return [void]
       def unregister(klass)
-        items.delete(klass.capability_name)
+        store.delete(klass.capability_name)
       end
 
       # Retrieve an item by name.

data/lib/action_mcp/resource_template.rb

@@ -31,7 +31,7 @@ module ActionMCP
       def abstract!
         @abstract = true
         # Unregister from the appropriate registry if already registered
-        return unless ActionMCP::ResourceTemplatesRegistry.items.values.include?(self)
+        return unless ActionMCP::ResourceTemplatesRegistry.store.values.include?(self)
 
         ActionMCP::ResourceTemplatesRegistry.unregister(self)
       end

data/lib/action_mcp/tool.rb

@@ -87,7 +87,7 @@ module ActionMCP
       end
 
       def unregister_from_registry
-        ActionMCP::ToolsRegistry.unregister(self) if ActionMCP::ToolsRegistry.items.values.include?(self)
+        ActionMCP::ToolsRegistry.unregister(self) if ActionMCP::ToolsRegistry.store.values.include?(self)
       end
 
       # Hook called when a class inherits from Tool

data/lib/action_mcp/tool_response.rb

@@ -102,7 +102,10 @@ module ActionMCP
         raise ArgumentError, "content must respond to #to_h"
       end
 
-      content.to_h.tap { |result| Content::Validation.validate_content_block!(result) }
+      result = content.to_h
+      # Built-in content validates itself in #to_h; anything else is checked here.
+      Content::Validation.validate_content_block!(result) unless content.is_a?(Content::Base)
+      result
     end
   end
 end

data/lib/action_mcp/version.rb

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

data/lib/action_mcp.rb

@@ -83,14 +83,14 @@ module ActionMCP
   #
   # @return [ActionMCP::RegistryBase::RegistryScope] the available tools
   def available_tools
-    ToolsRegistry.available_tools
+    ToolsRegistry.non_abstract
   end
 
   # Returns the available prompts.
   #
   # @return [ActionMCP::RegistryBase::RegistryScope] the available prompts
   def available_prompts
-    PromptsRegistry.available_prompts
+    PromptsRegistry.non_abstract
   end
 
   ActiveModel::Type.register(:string_array, StringArray)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmcp
 version: !ruby/object:Gem::Version
-  version: 0.201.0
+  version: 0.201.2
 platform: ruby
 authors:
 - Abdelkader Boudih