actionmcp 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1c71d0883d3ace526d4afda2bb71f53efd68b64b15a28febbc5d82710d8beb5
-  data.tar.gz: 30c3d4a8f241f52d103ab93544ce147aad7553dae08e60e7a4bccb1d408918aa
+  metadata.gz: 644f0795fca70107d86ba512e1c7083535f33269e4a53a488cc10d53d93ffd28
+  data.tar.gz: 187ecb0de2249772b758177195b4c6006ff44e296cd518ba0c44f9ab83b58b19
 SHA512:
-  metadata.gz: 3f2be84c315a68e574357e54b6500cfe2e1864dcf83a7633113c2e6268f90131d00c318e87cac247b931986085bc99baf020de9845a5733cea3a878bd45f2ee3
-  data.tar.gz: 64f6ccdcd734bae57d600730eba4058f2b7934e0c62ffef38f58185aa1d1f71102bd6a5be74e8f336e4494524908fcbc2e21ab44af7f08cfe031050834c4d628
+  metadata.gz: dee5271d34e57f3efb3b2459f1b258359a9b36040ca36e2567cf989435105322493cd344594a211a0cd4c426800153b5e9d21e7dd7c18a38183d79d593bedbb4
+  data.tar.gz: c5c5ecb5398636afec82b781622f130da83aee55c04765eb9a04fd06b444cd10fd4c27b65d7485a9775d771e60605a85c5137323be10234ca9ebfcd0bebd480d

data/lib/action_mcp/configuration.rb

@@ -14,7 +14,7 @@ module ActionMCP
     # @!attribute resources_subscribe
     #   @return [Boolean] Whether to subscribe to resources.
     # @!attribute logging_level
-    #   @return [Symbol] The logging level.    attr_writer :name, :version
+    #   @return [Symbol] The logging level.
     attr_writer :name, :version
     attr_accessor :logging_enabled,
                   :list_changed,
@@ -40,21 +40,27 @@ module ActionMCP
       @version || (has_rails_version ? Rails.application.version.to_s : "0.0.1")
     end
 
+    # Get active profile (considering thread-local override)
+    def active_profile
+      ActionMCP.thread_profiles.value || @active_profile
+    end
+
     # Load custom profiles from Rails configuration
     def load_profiles
       # First load defaults from the gem
       @profiles = default_profiles
 
-      # Then try to load from config/mcp.yml in the Rails app
-      config_path = Rails.root.join("config", "mcp.yml")
-      if File.exist?(config_path)
-        begin
-          yaml_content = YAML.safe_load(File.read(config_path), symbolize_names: true)
-          # Merge with defaults so user config overrides gem defaults
-          @profiles.deep_merge!(yaml_content) if yaml_content
-        rescue StandardError => e
-          Rails.logger.error "Failed to load MCP profiles from #{config_path}: #{e.message}"
-        end
+      # Try to load from config/mcp.yml in the Rails app using Rails.config_for
+      begin
+        app_config = Rails.application.config_for(:mcp)
+
+        raise "Invalid MCP config file" unless app_config.is_a?(Hash)
+
+        # Merge with defaults so user config overrides gem defaults
+        @profiles = app_config
+      rescue => e
+        # If the config file doesn't exist in the Rails app, just use the defaults
+        Rails.logger.debug "No MCP config found in Rails app, using defaults from gem"
       end
 
       # Apply the active profile
@@ -67,8 +73,8 @@ module ActionMCP
     def use_profile(profile_name)
       profile_name = profile_name.to_sym
       unless @profiles.key?(profile_name)
-        Rails.logger.warn "Profile '#{profile_name}' not found, using default"
-        profile_name = :default
+        Rails.logger.warn "Profile '#{profile_name}' not found, using primary"
+        profile_name = :primary
       end
 
       @active_profile = profile_name
@@ -81,7 +87,7 @@ module ActionMCP
     def filtered_tools
       return ToolsRegistry.non_abstract if should_include_all?(:tools)
 
-      tool_names = @profiles[@active_profile][:tools] || []
+      tool_names = @profiles[active_profile][:tools] || []
       # Convert tool names to underscored format
       tool_names = tool_names.map { |name| name.to_s.underscore }
       ToolsRegistry.non_abstract.select { |tool| tool_names.include?(tool.name.underscore) }
@@ -91,7 +97,7 @@ module ActionMCP
     def filtered_prompts
       return PromptsRegistry.non_abstract if should_include_all?(:prompts)
 
-      prompt_names = @profiles[@active_profile][:prompts] || []
+      prompt_names = @profiles[active_profile][:prompts] || []
       PromptsRegistry.non_abstract.select { |prompt| prompt_names.include?(prompt.name) }
     end
 
@@ -99,21 +105,45 @@ module ActionMCP
     def filtered_resources
       return ResourceTemplatesRegistry.non_abstract if should_include_all?(:resources)
 
-      resource_names = @profiles[@active_profile][:resources] || []
+      resource_names = @profiles[active_profile][:resources] || []
       ResourceTemplatesRegistry.non_abstract.select { |resource| resource_names.include?(resource.name) }
     end
 
     # Returns capabilities based on active profile
     def capabilities
       capabilities = {}
-      # Only include each capability if the corresponding filtered registry is non-empty
-      capabilities[:tools] = { listChanged: @list_changed } if filtered_tools.any?
-      capabilities[:prompts] = { listChanged: @list_changed } if filtered_prompts.any?
-      capabilities[:logging] = {} if @logging_enabled
-      capabilities[:resources] = { subscribe: @resources_subscribe } if filtered_resources.any?
+
+      # Only include capabilities if the corresponding filtered registry is non-empty
+      if filtered_tools.any?
+        capabilities[:tools] = { listChanged: @list_changed }
+      end
+
+      if filtered_prompts.any?
+        capabilities[:prompts] = { listChanged: @list_changed }
+      end
+
+      if @logging_enabled
+        capabilities[:logging] = {}
+      end
+
+      if filtered_resources.any?
+        capabilities[:resources] = { subscribe: @resources_subscribe }
+      end
+
       capabilities
     end
 
+    def apply_profile_options
+      profile = @profiles[active_profile]
+      return unless profile && profile[:options]
+
+      options = profile[:options]
+      @list_changed = options[:list_changed] unless options[:list_changed].nil?
+      @logging_enabled = options[:logging_enabled] unless options[:logging_enabled].nil?
+      @logging_level = options[:logging_level] unless options[:logging_level].nil?
+      @resources_subscribe = options[:resources_subscribe] unless options[:resources_subscribe].nil?
+    end
+
     private
 
     def default_profiles
@@ -143,22 +173,12 @@ module ActionMCP
       }
     end
 
-    def apply_profile_options
-      profile = @profiles[@active_profile]
-      return unless profile && profile[:options]
-
-      options = profile[:options]
-      @list_changed = options[:list_changed] unless options[:list_changed].nil?
-      @logging_enabled = options[:logging_enabled] unless options[:logging_enabled].nil?
-      @logging_level = options[:logging_level] unless options[:logging_level].nil?
-      @resources_subscribe = options[:resources_subscribe] unless options[:resources_subscribe].nil?
-    end
-
     def should_include_all?(type)
-      return true unless @profiles[@active_profile]
+      return false unless @profiles[active_profile]
 
-      items = @profiles[@active_profile][type]
-      items.nil? || items.include?("all")
+      items = @profiles[active_profile][type]
+      # Return true ONLY if items contains "all"
+      items && items.include?("all")
     end
 
     def has_rails_version
@@ -173,6 +193,11 @@ module ActionMCP
   class << self
     attr_accessor :server, :logger
 
+    # Thread-local storage for active profiles
+    def thread_profiles
+      @thread_profiles ||= Concurrent::ThreadLocalVar.new(nil)
+    end
+
     # Returns the configuration instance.
     def configuration
       @configuration ||= Configuration.new
@@ -183,14 +208,19 @@ module ActionMCP
       yield(configuration)
     end
 
-    # Temporarily use a different profile
     def with_profile(profile_name)
-      previous_profile = configuration.active_profile
-      configuration.use_profile(profile_name)
+      previous_profile = thread_profiles.value
+      thread_profiles.value = profile_name
+
+      # Apply the profile options when switching profiles
+      configuration.apply_profile_options if configuration
 
       yield if block_given?
     ensure
-      configuration.use_profile(previous_profile) if block_given?
+      thread_profiles.value = previous_profile if block_given?
+
+      # Reapply the previous profile's options when switching back
+      configuration.apply_profile_options if block_given? && configuration
     end
   end
 end

data/lib/action_mcp/version.rb

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

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

@@ -1,11 +1,21 @@
-primary:
-  tools:
-    - all
-  prompts:
-    - all
-  resources:
-    - all
-  options:
-    list_changed: false
-    resources_subscribe: false
+shared:
+  primary:
+    tools:
+      - all
+    prompts:
+      - all
+    resources:
+      - all
+    options:
+      list_changed: false
+      resources_subscribe: false
 
+#  minimal:
+#    tools: []
+#    prompts: []
+#    resources: []
+#    options:
+#      list_changed: false
+#      logging_enabled: false
+#      logging_level: :warn
+#      resources_subscribe: false

metadata

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