active_mcp 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791510bf59750086b139e1688d8cfd7367c635a359f2dfe2678756e612a20816
-  data.tar.gz: 320cb00fa8a75622a667260477c479fd1c9df653e54af85238dc77384923b0a9
+  metadata.gz: 1552f0de026c1ac0790e5fa34924b9263c0ce93ed7b331d174267e2b7dc2f7da
+  data.tar.gz: 7450308c7d05d625aa5f51e81695afa84039a0994ff055db068794ea8c9274fa
 SHA512:
-  metadata.gz: d65ba7458c1718d59d8b718eb8422192a1b520e72f877427feb4bdcb9057f9350718ebc8e4687eb7cc05f447962d728949cef94ed2c90937d82deb5ea3fc0727
-  data.tar.gz: 54ed82f6c351d9e91e4e4108ed27767564c84d7d0bfc65a101598c0cdc5b879c70aa1b926d2e5c60a8181372a88ad6e9049a7232242726607ae65f58b9585816
+  metadata.gz: 392a25227f1dc6d0d073821dec6f6e0b17fa3fcdf1c2bb55793b4d71eab2422c173abb21a70820134d119e785f0991fe2e68cfa85aee987ef5f542cd966b5b49
+  data.tar.gz: fb1af057ea0a2f4a0dcdb664c2228013a8f058f13850be2de19be1516e26febbb9df06d51c9d74ec6262d2aa1a14f283067390ee579b5a93c96c1a736b2b15fa

data/README.md

@@ -59,8 +59,8 @@ end
 class CreateNoteTool < ActiveMcp::Tool
   description "Create Note!!"
 
-  property :title, :string
-  property :content, :string
+  argument :title, :string
+  argument :content, :string
 
   def call(title:, content:)
     Note.create(title:, content:)
@@ -129,8 +129,8 @@ This creates a new tool file at `app/tools/search_users_tool.rb` with the follow
 class SearchUsersTool < ActiveMcp::Tool
   description 'Search users'
 
-  property :param1, :string, required: true, description: 'First parameter description'
-  property :param2, :string, required: false, description: 'Second parameter description'
+  argument :param1, :string, required: true, description: 'First parameter description'
+  argument :param2, :string, required: false, description: 'Second parameter description'
   # Add more parameters as needed
 
   def call(param1:, param2: nil, auth_info: nil, **args)
@@ -147,10 +147,10 @@ You can then customize the generated tool to fit your needs.
 ## Input Schema
 
 ```ruby
-property :name, :string, required: true, description: 'User name'
-property :age, :integer, required: false, description: 'User age'
-property :addresses, :array, required: false, description: 'User addresses'
-property :preferences, :object, required: false, description: 'User preferences'
+argument :name, :string, required: true, description: 'User name'
+argument :age, :integer, required: false, description: 'User age'
+argument :addresses, :array, required: false, description: 'User addresses'
+argument :preferences, :object, required: false, description: 'User preferences'
 ```
 
 Supported types include:
@@ -179,16 +179,16 @@ ActiveMcp supports both authentication (verifying who a user is) and authorizati
 
 ### Authorization for Tools
 
-You can control which tools are visible and accessible to different users by overriding the `authorized?` class method:
+You can control which tools are visible and accessible to different users by overriding the `visible?` class method:
 
 ```ruby
 class AdminOnlyTool < ActiveMcp::Tool
   description "This tool is only accessible by admins"
 
-  property :command, :string, required: true, description: "Admin command to execute"
+  argument :command, :string, required: true, description: "Admin command to execute"
 
   # Define authorization logic - only admin tokens can access this tool
-  def self.authorized?(auth_info)
+  def self.visible?(auth_info)
     return false unless auth_info
     return false unless auth_info[:type] == :bearer
 
@@ -274,7 +274,7 @@ Authentication information is automatically passed to your tools through the `au
 class SecuredDataTool < ActiveMcp::Tool
   description 'Access secured data'
 
-  property :resource_id, :string, required: true, description: 'ID of the resource to access'
+  argument :resource_id, :string, required: true, description: 'ID of the resource to access'
 
   def call(resource_id:, auth_info: nil, **args)
     # Check if auth info exists
@@ -345,9 +345,9 @@ For example, instead of creating a generic search tool, create specific search t
 class SearchUsersTool < ActiveMcp::Tool
   description 'Search users by criteria'
 
-  property :email, :string, required: false, description: 'Email to search for'
-  property :name, :string, required: false, description: 'Name to search for'
-  property :limit, :integer, required: false, description: 'Maximum number of records to return'
+  argument :email, :string, required: false, description: 'Email to search for'
+  argument :name, :string, required: false, description: 'Name to search for'
+  argument :limit, :integer, required: false, description: 'Maximum number of records to return'
 
   def call(email: nil, name: nil, limit: 10)
     criteria = {}
@@ -367,9 +367,9 @@ end
 class SearchPostsTool < ActiveMcp::Tool
   description 'Search posts by criteria'
 
-  property :title, :string, required: false, description: 'Title to search for'
-  property :author_id, :integer, required: false, description: 'Author ID to filter by'
-  property :limit, :integer, required: false, description: 'Maximum number of records to return'
+  argument :title, :string, required: false, description: 'Title to search for'
+  argument :author_id, :integer, required: false, description: 'Author ID to filter by'
+  argument :limit, :integer, required: false, description: 'Maximum number of records to return'
 
   def call(title: nil, author_id: nil, limit: 10)
     criteria = {}

data/app/controllers/active_mcp/base_controller.rb

@@ -4,9 +4,34 @@ module ActiveMcp
   class BaseController < ActionController::Base
     protect_from_forgery with: :null_session
     skip_before_action :verify_authenticity_token
-    before_action :process_authentication, only: [:index]
+    before_action :authenticate, only: [:index]
 
     def index
+      if params[:jsonrpc]
+        process_request_from_mcp_client
+      else
+        process_request_from_mcp_server
+      end
+    end
+
+    private
+
+    def process_request_from_mcp_server
+      case params[:method]
+      when Method::TOOLS_LIST
+        result = Response::ToolsList::Json.call(
+          tools: Response::Tools.to_hash(auth_info: @auth_info)
+        )
+      when Method::TOOLS_CALL
+        result = Response::ToolsCall::Json.call(params:, auth_info: @auth_info)
+      else
+        result = Response::NoMethod.call
+      end
+
+      render json: result, status: 200
+    end
+
+    def process_request_from_mcp_client
       case params[:method]
       when Method::INITIALIZE
         result = Response::Initialize.call(id: params[:id])
@@ -15,28 +40,20 @@ module ActiveMcp
       when Method::CANCELLED
         result = Response::Cancelled.call
       when Method::TOOLS_LIST
-        tools = Response::Tools.to_hash(auth_info: @auth_info)
-        if params[:jsonrpc]
-          result = Response::ToolsList::Jsonrpc.call(id: params[:id], tools:)
-        else
-          result = Response::ToolsList::Json.call(tools:)
-        end
+        result = Response::ToolsList::Jsonrpc.call(
+          id: params[:id],
+          tools: Response::Tools.to_hash(auth_info: @auth_info)
+        )
       when Method::TOOLS_CALL
-        if params[:jsonrpc]
-          result = Response::ToolsCall::Jsonrpc.call(id: params[:id], params:, auth_info: @auth_info)
-        else
-          result = Response::ToolsCall::Json.call(params:, auth_info: @auth_info)
-        end
+        result = Response::ToolsCall::Jsonrpc.call(id: params[:id], params:, auth_info: @auth_info)
       else
         result = Response::NoMethod.call
       end
 
-      render json: result[:body], status: result[:status]
+      render json: result, status: 200
     end
 
-    private
-
-    def process_authentication
+    def authenticate
       auth_header = request.headers["Authorization"]
       if auth_header.present?
         @auth_info = {

data/app/models/active_mcp/response/initialize.rb

@@ -1,32 +1,29 @@
 module ActiveMcp
   module Response
     class Initialize
-      def self.to_hash(id:, name:, version:)
+      def self.call(id:)
         {
-          body: {
-            jsonrpc: JSON_RPC_VERSION,
-            id:,
-            result: {
-              protocolVersion: PROTOCOL_VERSION,
+          jsonrpc: JSON_RPC_VERSION,
+          id:,
+          result: {
+            protocolVersion: PROTOCOL_VERSION,
+            capabilities: {
+              logging: {},
               capabilities: {
-                logging: {},
-                capabilities: {
-                  resources: {
-                    subscribe: false,
-                    listChanged: false
-                  },
-                  tools: {
-                    listChanged: false
-                  }
+                resources: {
+                  subscribe: false,
+                  listChanged: false
                 },
+                tools: {
+                  listChanged: false
+                }
               },
-              serverInfo: {
-                name: ActiveMcp.config.server_name,
-                version: ActiveMcp.config.server_version
-              }
+            },
+            serverInfo: {
+              name: ActiveMcp.config.server_name,
+              version: ActiveMcp.config.server_version
             }
-          },
-          status: 200
+          }
         }
       end
     end

data/app/models/active_mcp/response/initialized.rb

@@ -1,13 +1,10 @@
 module ActiveMcp
   module Response
     class Initialized
-      def self.to_hash
+      def self.call
         {
-          body: {
-            jsonrpc: JSON_RPC_VERSION,
-            method: Method::INITIALIZED
-          },
-          status: 200
+          jsonrpc: JSON_RPC_VERSION,
+          method: Method::INITIALIZED
         }
       end
     end

data/app/models/active_mcp/response/no_method.rb

@@ -3,8 +3,7 @@ module ActiveMcp
     class NoMethod
       def self.call
         {
-          body: { error: "Method not found" },
-          status: 404
+          error: "Method not found"
         }
       end
     end

data/app/models/active_mcp/response/tools.rb

@@ -3,7 +3,7 @@ module ActiveMcp
     class Tools
       def self.to_hash(auth_info:)
         Tool.registered_tools.select do |tool_class|
-          tool_class.authorized?(auth_info)
+          tool_class.visible?(auth_info)
         end.map do |tool_class|
           {
             name: tool_class.tool_name,

data/app/models/active_mcp/response/tools_call/json.rb

@@ -3,62 +3,7 @@ module ActiveMcp
     module ToolsCall
       class Json
         def self.call(params:, auth_info:)
-          tool_name = params[:name]
-
-          unless tool_name
-            return {
-              body: {error: "Invalid params: missing tool name"},
-              status: 400
-            }
-          end
-
-          tool_class = Tool.registered_tools.find do |tc|
-            tc.tool_name == tool_name
-          end
-
-          unless tool_class
-            return {
-              body: {error: "Tool not found: #{tool_name}"},
-              status: 404
-            }
-          end
-
-          unless tool_class.authorized?(auth_info)
-            return {
-              body: {error: "Unauthorized: Access to tool '#{tool_name}' denied"},
-              status: 401
-            }
-          end
-
-          arguments = params[:arguments].permit!.to_hash.symbolize_keys.transform_values { _1.match(/^\d+$/) ? _1.to_i : _1 }
-
-          p arguments
-
-          tool = tool_class.new
-          validation_result = tool.validate_arguments(arguments)
-
-          if validation_result.is_a?(Hash) && validation_result[:error]
-            return {
-              body: {result: validation_result[:error]},
-              status: 400
-            }
-          end
-
-          begin
-            arguments[:auth_info] = auth_info if auth_info.present?
-
-            result = tool.call(**arguments.symbolize_keys)
-
-            return {
-              body: {result: result},
-              status: 200,
-            }
-          rescue => e
-            return {
-              body: {error: "Error: #{e.message}"},
-              status: 500
-            }
-          end
+          ActiveMcp::ToolExecutor.call(params:, auth_info:)
         end
       end
     end

data/app/models/active_mcp/response/tools_call/jsonrpc.rb

@@ -3,21 +3,11 @@ module ActiveMcp
     module ToolsCall
       class Jsonrpc
         def self.call(id:, params:, auth_info:)
-          result = Json.call(params: params[:params], auth_info:)
+          result = ActiveMcp::ToolExecutor.call(params: params[:params], auth_info:)
           {
-            body: {
-              jsonrpc: JSON_RPC_VERSION,
-              id:,
-              result: {
-                content: [
-                  {
-                    type: "text",
-                    text: result[:body][:result]
-                  }
-                ]
-              },
-            },
-            status: result[:status]
+            jsonrpc: JSON_RPC_VERSION,
+            id:,
+            result:
           }
         end
       end

data/app/models/active_mcp/response/tools_list/json.rb

@@ -4,8 +4,7 @@ module ActiveMcp
       class Json
         def self.call(tools:)
           {
-            body: { result: tools},
-            status: 200
+            result: tools
           }
         end
       end

data/app/models/active_mcp/response/tools_list/jsonrpc.rb

@@ -4,12 +4,9 @@ module ActiveMcp
       class Jsonrpc
         def self.call(id:, tools:)
           {
-            body: {
-              jsonrpc: JSON_RPC_VERSION,
-              id:,
-              result: {tools:}
-            },
-            status: 200
+            jsonrpc: JSON_RPC_VERSION,
+            id:,
+            result: {tools:}
           }
         end
       end

data/app/models/active_mcp/tool_executor.rb

@@ -0,0 +1,104 @@
+module ActiveMcp
+  module ToolExecutor
+    def self.call(params:, auth_info:)
+      tool_name = params[:name]
+
+      unless tool_name
+        return {
+          isError: true,
+          content: [
+            {
+              type: "text",
+              text: "Invalid params: missing tool name",
+            }
+          ]
+        }
+      end
+
+      tool_class = Tool.registered_tools.find do |tc|
+        tc.tool_name == tool_name
+      end
+
+      unless tool_class
+        return {
+          isError: true,
+          content: [
+            {
+              type: "text",
+              text: "Tool not found: #{tool_name}",
+            }
+          ]
+        }
+      end
+
+      unless tool_class.visible?(auth_info)
+        return {
+          isError: true,
+          content: [
+            {
+              type: "text",
+              text: "Unauthorized: Access to tool '#{tool_name}' denied",
+            }
+          ]
+        }
+      end
+
+      arguments = params[:arguments].permit!.to_hash.symbolize_keys.transform_values do |value|
+        if !value.is_a?(String)
+          value
+        else
+          value.match(/^\d+$/) ? value.to_i : value
+        end
+      end
+
+      tool = tool_class.new
+      validation_result = tool.validate_arguments(arguments)
+
+      if validation_result.is_a?(Hash) && validation_result[:error]
+        return {
+          isError: true,
+          content: [
+            {
+              type: "text",
+              text: validation_result[:error],
+            }
+          ]
+        }
+      end
+
+      begin
+        arguments[:auth_info] = auth_info if auth_info.present?
+
+        return {
+          content: [
+            {
+              type: "text",
+              text: formatted(tool.call(**arguments.symbolize_keys))
+            }
+          ]
+        }
+      rescue => e
+        return {
+          isError: true,
+          content: [
+            {
+              type: "text",
+              text: "Error: #{e.message}",
+            }
+          ]
+        }
+      end
+    end
+
+    def self.formatted(object)
+      case object
+      when String
+        object
+      when Hash
+        object.to_json
+      else
+        object.to_s
+      end
+    end
+  end
+end

data/lib/active_mcp/server/tool_manager.rb

@@ -36,7 +36,6 @@ module ActiveMcp
       def invoke_tool(name, arguments)
         require "net/http"
         
-        # URIの検証
         unless @uri.is_a?(URI) || @uri.is_a?(String)
           log_error("Invalid URI type", StandardError.new("URI must be a String or URI object"))
           return {
@@ -48,7 +47,6 @@ module ActiveMcp
         begin
           uri = URI.parse(@uri.to_s)
           
-          # 有効なスキームとホストの検証
           unless uri.scheme =~ /\Ahttps?\z/ && !uri.host.nil?
             log_error("Invalid URI", StandardError.new("URI must have a valid scheme and host"))
             return {
@@ -57,7 +55,6 @@ module ActiveMcp
             }
           end
           
-          # 本番環境ではHTTPSを強制
           if defined?(Rails) && Rails.env.production? && uri.scheme != "https"
             return {
               isError: true,
@@ -87,15 +84,7 @@ module ActiveMcp
           end
 
           if response.code == "200"
-            body = JSON.parse(response.body, symbolize_names: true)
-            if body[:error]
-              {
-                isError: true,
-                content: [{type: "text", text: body[:error]}]
-              }
-            else
-              format_result(body[:result])
-            end
+            JSON.parse(response.body, symbolize_names: true)
           else
             {
               isError: true,
@@ -103,7 +92,6 @@ module ActiveMcp
             }
           end
         rescue => e
-          # ログに詳細を記録
           log_error("Error calling tool", e)
           {
             isError: true,
@@ -117,7 +105,6 @@ module ActiveMcp
 
         require "net/http"
         
-        # URIの検証
         unless @uri.is_a?(URI) || @uri.is_a?(String)
           log_error("Invalid URI type", StandardError.new("URI must be a String or URI object"))
           return
@@ -126,13 +113,11 @@ module ActiveMcp
         begin
           uri = URI.parse(@uri.to_s)
           
-          # 有効なスキームとホストの検証
           unless uri.scheme =~ /\Ahttps?\z/ && !uri.host.nil?
             log_error("Invalid URI", StandardError.new("URI must have a valid scheme and host"))
             return
           end
           
-          # 本番環境ではHTTPSを強制
           if defined?(Rails) && Rails.env.production? && uri.scheme != "https"
             log_error("HTTPS is required in production environment", StandardError.new("Non-HTTPS URI in production"))
             return
@@ -162,17 +147,6 @@ module ActiveMcp
           @tools = []
         end
       end
-
-      def format_result(result)
-        case result
-        when String
-          {content: [{type: "text", text: result}]}
-        when Hash
-          {content: [{type: "text", text: result.to_json}]}
-        else
-          {content: [{type: "text", text: result.to_s}]}
-        end
-      end
       
       def log_error(message, error)
         error_details = "#{message}: #{error.message}\n"
@@ -181,7 +155,6 @@ module ActiveMcp
         if defined?(Rails)
           Rails.logger.error(error_details)
         else
-          # Fallback to standard error output if Rails is not available
           $stderr.puts(error_details)
         end
       end

data/lib/active_mcp/tool.rb

@@ -25,6 +25,10 @@ module ActiveMcp
         @schema["required"] << name.to_s if required
       end
 
+      def argument(...)
+        property(...)
+      end
+
       def registered_tools
         @registered_tools ||= []
       end
@@ -35,7 +39,7 @@ module ActiveMcp
         registered_tools << subclass
       end
 
-      def authorized?(auth_info)
+      def visible?(auth_info)
         true
       end
     end

data/lib/active_mcp/version.rb

@@ -1,3 +1,3 @@
 module ActiveMcp
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/lib/generators/active_mcp/tool/templates/tool.rb.erb

@@ -1,13 +1,13 @@
 class <%= class_name %> < ActiveMcp::Tool
   description "<%= file_name.humanize %>"
   
-  property :param1, :string, required: true, description: "First parameter description"
-  property :param2, :string, required: false, description: "Second parameter description"
+  argument :param1, :string, required: true, description: "First parameter description"
+  argument :param2, :string, required: false, description: "Second parameter description"
   # Add more parameters as needed
   
   # Uncomment and modify this method to implement authorization control
   # This controls who can see and use this tool
-  # def self.authorized?(auth_info)
+  # def self.visible?(auth_info)
   #   # Example: require authentication
   #   # return false unless auth_info
   #   

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: active_mcp
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
-- Your Name
+- Moeki Kawakami
 bindir: exe
 cert_chain: []
 date: 2025-04-06 00:00:00.000000000 Z
@@ -45,7 +45,7 @@ dependencies:
         version: '0'
 description: A Rails engine that provides MCP capabilities to your Rails application
 email:
-- your.email@example.com
+- hi@moeki.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -63,6 +63,7 @@ files:
 - app/models/active_mcp/response/tools_call/jsonrpc.rb
 - app/models/active_mcp/response/tools_list/json.rb
 - app/models/active_mcp/response/tools_list/jsonrpc.rb
+- app/models/active_mcp/tool_executor.rb
 - config/routes.rb
 - lib/active_mcp.rb
 - lib/active_mcp/configuration.rb
@@ -77,7 +78,6 @@ files:
 - lib/active_mcp/version.rb
 - lib/generators/active_mcp/install/install_generator.rb
 - lib/generators/active_mcp/install/templates/initializer.rb
-- lib/generators/active_mcp/install/templates/mcp_server.rb
 - lib/generators/active_mcp/tool/templates/tool.rb.erb
 - lib/generators/active_mcp/tool/tool_generator.rb
 homepage: https://github.com/moekiorg/active_mcp

data/lib/generators/active_mcp/install/templates/mcp_server.rb

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-# MCP Server script for Active MCP
-require 'active_mcp'
-
-# Load Rails application
-ENV['RAILS_ENV'] ||= 'development'
-require File.expand_path('../config/environment', __dir__)
-
-# Initialize MCP server
-server = ActiveMcp::Server.new(
-  name: "<%= Rails.application.class.module_parent_name %> MCP Server",
-  uri: '<%= Rails.application.config.action_controller.default_url_options&.fetch(:host, 'http://localhost:3000') %>/mcp'
-)
-
-# Optional authentication
-<% if ActiveMcp.config.auth_enabled %>
-server.auth = {
-  type: :bearer,
-  token: ENV['MCP_AUTH_TOKEN'] || '<%= ActiveMcp.config.auth_token %>'
-}
-<% end %>
-
-# Start the server
-puts "Starting MCP server for <%= Rails.application.class.module_parent_name %>..."
-puts "Connect to this server in MCP clients using the following configuration:"
-puts
-puts "   Command: #{File.expand_path(__FILE__)}"
-puts "   Args: []"
-puts
-puts "Press Ctrl+C to stop the server"
-server.start