active_mcp 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2bdc655ae59a42ab77ecf1767f4a6717be9586100b51d1f6436da37346be92f
-  data.tar.gz: 682c5b2b9ce9d08983172d3cca17ee0a12c98169c081bbf06bb90ad361d8bd73
+  metadata.gz: 40c074a297950ebddab382dabdb7e373e3aeebf5e11017bd40f6dea597ca7215
+  data.tar.gz: 72ac9984228f99aa5a787e09af86b144a1f66837b1eadb38c6b857be8d455416
 SHA512:
-  metadata.gz: 53e87889ab3a2a9dc1a87a97f9c0181ee9d38d57ce332e70c9096da99df0630b6f16ce2d3e6fff16642216bf1cc509121b0ca6817118dd48e811b1bc62db4a04
-  data.tar.gz: edbff3c0e32089eda22d0c6aa90670f7857b31a253142e3f60517e37c509bb46c7ab488ad6577f3dd991c1d3fb29f21984750d6a83b2465e061ff856be90eed6
+  metadata.gz: 984057ffb2c91a788e0c69e19101a98aae9a6b526471e346cb4fc5151f0a978aaa454eb1ab6ed4e4c9e598c55e074027212214e19c37187c288a2d35621a84c5
+  data.tar.gz: c046c53ec3523d3f800fbd8350fe44233ddd13218ff72022f5367e0b15062774e40de789644f609a56cc5e1e163f9a1d8ceb80d915d695dd96fec183f1bd9857

data/README.md

@@ -95,7 +95,7 @@ $ rails generate active_mcp:tool create_note
 ```ruby
 class CreateNoteTool < ActiveMcp::Tool::Base
   def tool_name
-    "Create Note"
+    "create_note"
   end
 
   def description
@@ -117,7 +117,11 @@ end
 
 ```ruby
 class MySchema < ActiveMcp::Schema::Base
-  tool CreateNoteTool.new
+  def tools
+    [
+      CreateNoteTool.new
+    ]
+  end
 end
 ```
 
@@ -125,6 +129,9 @@ end
 
 ```ruby
 class MyMcpController < ActiveMcp::BaseController
+
+  private
+
   def schema
     MySchema.new(context:)
   end
@@ -271,7 +278,7 @@ Control access to tools by overriding the `visible?` class method:
 ```ruby
 class AdminOnlyTool < ActiveMcp::Tool::Base
   def tool_name
-    "Admin-only tool"
+    "admin_only_tool"
   end
 
   def description
@@ -380,8 +387,10 @@ end
 
 ```ruby
 class MySchema < ActiveMcp::Schema::Base
-  User.all.each do |user|
-    resource UserResource.new(id: user.id)
+  def resources
+    User.all.each do |user|
+      UserResource.new(id: user.id)
+    end
   end
 end
 ```
@@ -500,8 +509,10 @@ end
 
 ```ruby
 class MySchema < ActiveMcp::Schema::Base
-  User.all.each do |user|
-    resource UserResource.new(id: user.id)
+  def resources
+    User.all.each do |user|
+      UserResource.new(id: user.id)
+    end
   end
 end
 ```
@@ -516,33 +527,31 @@ Resources are Ruby classes `**Prompt`:
 
 ```ruby
 class HelloPrompt < ActiveMcp::Prompt::Base
-  class << self
-    def prompt_name
-      "hello"
-    end
+  argument :name, ->(value) do
+    User.all.pluck(:name).filter { _1.match(value) }
+  end
 
-    def description
-      "This is a test."
-    end
+  def initialize(greeting:)
+    @greeting = greeting
+  end
 
-    def visible?(context:)
-      # Your logic...
-    end
+  def prompt_name
+    "hello"
   end
 
-  argument :name, ->(value) do
-    User.all.pluck(:name).filter { _1.match(value) }
+  def description
+    "This is a test."
   end
 
-  def initialize(name:)
-    @name = name
+  def visible?(context:)
+    # Your logic...
   end
 
-  def messages
+  def messages(name:)
     [
       ActiveMcp::Message::Text.new(
         role: "user",
-        text: "Hello! #{@name}"
+        text: "#{@greeting} #{name}"
       ),
       ActiveMcp::Message::Image.new(
         role: "assistant",
@@ -565,7 +574,11 @@ end
 
 ```ruby
 class MySchema < ActiveMcp::Schema::Base
-  prompt HelloPrompt
+  def prompts
+    [
+      HelloPrompt.new(greeting: "Hello!")
+    ]
+  end
 end
 ```
 
@@ -624,7 +637,7 @@ end
 
 ## 🧪 Development
 
-After checking out the repo, run `bundle install` to install dependencies. Then, run `bundle exec rake` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bundle install` to install dependencies. Then, run `bundle exec rake` to run the tests.
 
 ## 👥 Contributing
 

data/app/controllers/concerns/active_mcp/request_handlable.rb

@@ -21,11 +21,11 @@ module ActiveMcp
       when Method::CANCELLED
         render "active_mcp/cancelled", formats: :json
       when Method::RESOURCES_LIST
-        @resources = schema.resources
+        @resources = schema.visible_resources
         @format = :jsonrpc
         render "active_mcp/resources_list", formats: :json
       when Method::RESOURCES_TEMPLATES_LIST
-        @resource_templates = schema.resource_templates
+        @resource_templates = schema.visible_resource_templates
         @format = :jsonrpc
         render "active_mcp/resource_templates_list", formats: :json
       when Method::RESOURCES_READ
@@ -33,7 +33,7 @@ module ActiveMcp
         @format = :jsonrpc
         render "active_mcp/resources_read", formats: :json
       when Method::TOOLS_LIST
-        @tools = schema.tools
+        @tools = schema.visible_tools
         @format = :jsonrpc
         render "active_mcp/tools_list", formats: :json
       when Method::TOOLS_CALL
@@ -42,15 +42,15 @@ module ActiveMcp
         render "active_mcp/tools_call", formats: :json
       when Method::COMPLETION_COMPLETE
         type = params.dig(:params, :ref, :type)
-        @completion = ActiveMcp::Completion.new.complete(params: params[:params], context:, refs: (type === "ref/resource") ? schema.resource_templates : schema.prompts)
+        @completion = ActiveMcp::Completion.new.complete(params: params[:params], context:, refs: (type === "ref/resource") ? schema.visible_resource_templates : schema.visible_prompts)
         @format = :jsonrpc
         render "active_mcp/completion_complete", formats: :json
       when Method::PROMPTS_LIST
-        @prompts = schema.prompts
+        @prompts = schema.visible_prompts
         @format = :jsonrpc
         render "active_mcp/prompts_list", formats: :json
       when Method::PROMPTS_GET
-        @prompt = schema.prompts.find { _1.prompt_name == params[:params][:name] }.new(**params[:params][:arguments].permit!.to_h.symbolize_keys)
+        @prompt = schema.visible_prompts.find { _1.prompt_name == params[:params][:name] }
         @format = :jsonrpc
         render "active_mcp/prompts_get", formats: :json
       else
@@ -62,7 +62,7 @@ module ActiveMcp
     def handle_mcp_server_request
       case params[:method]
       when Method::RESOURCES_LIST
-        @resources = schema.resources
+        @resources = schema.visible_resources
         @format = :json
         render "active_mcp/resources_list", formats: :json
       when Method::RESOURCES_READ
@@ -70,11 +70,11 @@ module ActiveMcp
         @format = :json
         render "active_mcp/resources_read", formats: :json
       when Method::RESOURCES_TEMPLATES_LIST
-        @resource_templates = schema.resource_templates
+        @resource_templates = schema.visible_resource_templates
         @format = :json
         render "active_mcp/resource_templates_list", formats: :json
       when Method::TOOLS_LIST
-        @tools = schema.tools
+        @tools = schema.visible_tools
         @format = :json
         render "active_mcp/tools_list", formats: :json
       when Method::TOOLS_CALL
@@ -83,15 +83,15 @@ module ActiveMcp
         render "active_mcp/tools_call", formats: :json
       when Method::COMPLETION_COMPLETE
         type = params.dig(:params, :ref, :type)
-        @completion = ActiveMcp::Completion.new.complete(params: params[:params], context:, refs: (type == "ref/resource") ? schema.resource_templates : schema.prompts)
+        @completion = ActiveMcp::Completion.new.complete(params: params[:params], context:, refs: (type == "ref/resource") ? schema.visible_resource_templates : schema.visible_prompts)
         @format = :json
         render "active_mcp/completion_complete", formats: :json
       when Method::PROMPTS_LIST
-        @prompts = schema.prompts
+        @prompts = schema.visible_prompts
         @format = :json
         render "active_mcp/prompts_list", formats: :json
       when Method::PROMPTS_GET
-        @prompt = schema.prompts&.find { _1.prompt_name == params[:params][:name] }&.new(**params[:params][:arguments].permit!.to_h.symbolize_keys)
+        @prompt = schema.visible_prompts&.find { _1.prompt_name == params[:params][:name] }
         @format = :json
         render "active_mcp/prompts_get", formats: :json
       else

data/app/controllers/concerns/active_mcp/resource_readable.rb

@@ -18,7 +18,7 @@ module ActiveMcp
         }
       end
 
-      resource = schema.resources.find do |r|
+      resource = schema.visible_resources.find do |r|
         r.uri == uri
       end
 

data/app/controllers/concerns/active_mcp/tool_executable.rb

@@ -25,7 +25,7 @@ module ActiveMcp
         }
       end
 
-      tool = schema.tools.find do |tc|
+      tool = schema.visible_tools.find do |tc|
         tc.tool_name == tool_name
       end
 

data/app/views/active_mcp/prompts_get.json.jbuilder

@@ -2,6 +2,6 @@ json.jsonrpc ActiveMcp::JSON_RPC_VERSION if @format == :jsonrpc
 json.id @id if @format == :jsonrpc && @id.present?
 
 json.result do
-  json.description @prompt.class.description
-  json.messages @prompt.messages.map(&:to_h)
+  json.description @prompt.description
+  json.messages @prompt.messages(**params[:params][:arguments].permit!.to_h.symbolize_keys).map(&:to_h)
 end

data/app/views/active_mcp/prompts_list.json.jbuilder

@@ -6,7 +6,7 @@ json.result do
     json.array!(@prompts) do |prompt|
       json.name prompt.prompt_name
       json.description prompt.description
-      json.arguments prompt.arguments.map { _1.except(:complete) }
+      json.arguments prompt.class.arguments.map { _1.except(:complete) }
     end
   end
 end

data/app/views/active_mcp/resources_read.json.jbuilder

@@ -1,12 +1,14 @@
 json.jsonrpc ActiveMcp::JSON_RPC_VERSION if @format == :jsonrpc
 json.id @id if @format == :jsonrpc && @id.present?
 
-json.isError @resource[:isError] if @resource[:isError]
-json.contents do
-  json.array!(@resource[:contents]) do |content|
-    json.uri content[:uri]
-    json.mimeType raw content[:mimeType]
-    json.text raw content[:text] if content[:text]
-    json.blob content[:blob] if content[:blob]
+json.result do
+  json.isError @resource[:isError] if @resource[:isError]
+  json.contents do
+    json.array!(@resource[:contents]) do |content|
+      json.uri content[:uri]
+      json.mimeType raw content[:mimeType]
+      json.text raw content[:text] if content[:text]
+      json.blob content[:blob] if content[:blob]
+    end
   end
 end

data/lib/active_mcp/schema/base.rb

@@ -1,54 +1,34 @@
 module ActiveMcp
   module Schema
     class Base
-      class << self
-        attr_reader :resources, :resource_templates, :tools, :prompts
-
-        def resource(klass)
-          @resources ||= []
-          @resources << klass
-
-          if klass.class.respond_to?(:uri_template)
-            @resource_templates ||= []
-            @resource_templates << klass.class unless klass.class.in?(@resource_templates)
-          end
-        end
-
-        def tool(klass)
-          @tools ||= []
-          @tools << klass
-        end
-
-        def prompt(klass)
-          @prompts ||= []
-          @prompts << klass
-        end
-      end
+      attr_reader :context
 
       def initialize(context: {})
         @context = context
       end
 
-      def resources
-        self.class.resources&.filter do |resource|
-          !resource.respond_to?(:visible?) || resource.visible?(context: @context)
+      def visible_resources
+        resources&.filter do |resource|
+          !resource.class.respond_to?(:uri_template) && !resource.respond_to?(:visible?) || resource.visible?(context: @context)
         end
       end
 
-      def resource_templates
-        self.class.resource_templates&.filter do |template|
-          !template.respond_to?(:visible?) || template.visible?(context: @context)
+      def visible_resource_templates
+        resource_instances = resources&.filter do |resource|
+          resource.class.respond_to?(:uri_template) && (!resource.respond_to?(:visible?) || resource.visible?(context: @context))
         end
+
+        resource_instances.map(&:class)
       end
 
-      def tools
-        self.class.tools&.filter do |tool|
+      def visible_tools
+        tools&.filter do |tool|
           !tool.respond_to?(:visible?) || tool.visible?(context: @context)
         end
       end
 
-      def prompts
-        self.class.prompts&.filter do |resource|
+      def visible_prompts
+        prompts&.filter do |resource|
           !resource.respond_to?(:visible?) || resource.visible?(context: @context)
         end
       end

data/lib/active_mcp/server/protocol_handler.rb

@@ -174,7 +174,7 @@ module ActiveMcp
         arguments = request.dig(:params, :arguments)
         result = @server.fetch(params: {method: Method::PROMPTS_GET, params: {name:, arguments:}})
 
-        success_response(request[:id], result)
+        success_response(request[:id], result[:result])
       end
 
       def success_response(id, result)

data/lib/active_mcp/version.rb

@@ -1,3 +1,3 @@
 module ActiveMcp
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mcp
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Moeki Kawakami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-08 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails