actionmcp 0.60.0 → 0.60.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93a62c8f6a0c3fc99c77869dc3c4234374cdcf10dc31b67a6cb69bc8d258a9b9
-  data.tar.gz: bd216791bd8df048c94ee26d861a3aac6596fd3d62936a3e907a5b5080a00bae
+  metadata.gz: 2384a0cea84e17ca34e3c46e4029e2dc008561ebeeb8e52f15cb05c3fb5f5eb4
+  data.tar.gz: ccba3d9432ae0be54a4950e2f5d357c55fdd39cec2766253e2b3093dba9eedd8
 SHA512:
-  metadata.gz: 78db835a29ef0d605677b74cc8ff7b1a3c7b63547c5fc4d24ad30149be3452aee37af06f8f29fda95b734509bffdf65179e5088b35f33c13fde77011de5e7c27
-  data.tar.gz: a80dcfcad14f41076ccabe4ab9d9532305ea6e799bbd8be1cc89a29788858c3e28a08c674f8dc34b7a37bd8a9e78ea0d7fa3bc25da818c764cd16847e67c36e1
+  metadata.gz: e7ed0c8b71d4211dc48388a7544c17ecb9ff674faad9274cd1225cb3e3a65f76bcb546c2c2353882a1ade9016670659fed38aa1c90aa94e17479149012e1be01
+  data.tar.gz: add51e3d310ec89d96bef2767008bc4be9f9bddfeda60ca826d6e9168485771ebf61c03e1011c889d0a57fb4ff3d7bb0e0f5c5046cb35ca69a5285d647fe71d2

data/README.md

@@ -48,7 +48,16 @@ To start using ActionMCP, add it to your project:
   $ bundle add actionmcp
   ```
 
-This will load the ActionMCP library so you can start defining MCP prompts, tools, and resources in your application.
+After adding the gem, run the install generator to set up the basic ActionMCP structure:
+
+```bash
+bundle install
+bin/rails action_mcp:install:migrations
+bin/rails db:migrate
+bin/rails generate action_mcp:install
+```
+
+This will create the base application classes, configuration file, and necessary database tables for ActionMCP to function properly.
 
 ## Core Components
 
@@ -309,7 +318,8 @@ Then install it:
 
 ```bash
 bundle install
-bin/rails solid_mcp:install
+bin/rails solid_mcp:install:migrations
+bin/rails db:migrate
 ```
 
 The installer will create the necessary database migration for message storage. Configure it in your `config/mcp.yml`.
@@ -623,6 +633,33 @@ run ActionMCP::Engine
 bin/rails s -c mcp.ru -p 62770 -P tmp/pids/mcps0.pid
 ```
 
+### Dealing with Middleware Conflicts
+
+If your Rails application uses middleware that interferes with MCP server operation (like Devise, Warden, Ahoy, Rack::Cors, etc.), use `mcp_vanilla.ru` instead:
+
+```ruby
+# mcp_vanilla.ru - A minimal Rack app with only essential middleware
+# This avoids conflicts with authentication, tracking, and other web-specific middleware
+# See the file for detailed documentation on when and why to use it
+
+bundle exec rails s -c mcp_vanilla.ru -p 62770
+# Or with Falcon:
+bundle exec falcon serve --bind http://0.0.0.0:62770 --config mcp_vanilla.ru
+```
+
+Common middleware that can cause issues:
+- **Devise/Warden** - Expects cookies and sessions, throws `Devise::MissingWarden` errors
+- **Ahoy** - Analytics tracking that intercepts requests
+- **Rack::Attack** - Rate limiting designed for web traffic
+- **Rack::Cors** - CORS headers meant for browsers
+- Any middleware assuming HTML responses or cookie-based authentication
+
+An example of a minimal `mcp_vanilla.ru` file is located in the dummy app : test/dummy/mcp_vanilla.ru. 
+This file is a minimal Rack application that only includes the essential middleware needed for MCP server operation, avoiding conflicts with web-specific middleware.
+But remember to add any instrumentation or logging middleware you need, as the minimal setup will not include them by default.
+
+```ruby
+
 ## Production Deployment of MCPS0
 
 In production, **MCPS0** (the MCP server) is a standard Rack application. You can run it using any Rack-compatible server (such as Puma, Unicorn, or Passenger). 
@@ -637,7 +674,7 @@ Run MCPS0 on its own TCP port (commonly `62770`):
 
 **With Falcon:**
 ```bash
-bundle exec falcon serve --bind http://0.0.0.0:62770 mcp.ru
+bundle exec falcon serve --bind http://0.0.0.0:62770 --config mcp.ru
 ```
 
 **With Puma:**

data/app/controllers/action_mcp/application_controller.rb

@@ -5,7 +5,6 @@ module ActionMCP
   # Supports GET for server-initiated SSE streams, POST for client messages
   # (responding with JSON or SSE), and optionally DELETE for session termination.
   class ApplicationController < ActionController::API
-    REQUIRED_PROTOCOL_VERSION = "2025-03-26"
     MCP_SESSION_ID_HEADER = "Mcp-Session-Id"
 
     include Engine.routes.url_helpers
@@ -143,11 +142,14 @@ module ActionMCP
     # Handles POST requests containing client JSON-RPC messages according to 2025-03-26 spec.
     # @route POST /mcp
     def create
-      return render_not_acceptable(post_accept_headers_error_message) unless post_accept_headers_valid?
+      unless post_accept_headers_valid?
+        id = extract_jsonrpc_id_from_params
+        return render_not_acceptable(post_accept_headers_error_message, id)
+      end
 
       # Reject JSON-RPC batch requests as per MCP 2025-06-18 spec
       if jsonrpc_params_batch?
-        return render_bad_request("JSON-RPC batch requests are not supported")
+        return render_bad_request("JSON-RPC batch requests are not supported", nil)
       end
 
       is_initialize_request = check_if_initialize_request(jsonrpc_params)
@@ -160,11 +162,14 @@ module ActionMCP
 
       unless is_initialize_request
         if session_initially_missing
-          return render_bad_request("Mcp-Session-Id header is required for this request.")
+          id = jsonrpc_params.respond_to?(:id) ? jsonrpc_params.id : nil
+          return render_bad_request("Mcp-Session-Id header is required for this request.", id)
         elsif session.nil? || session.new_record?
-          return render_not_found("Session not found.")
+          id = jsonrpc_params.respond_to?(:id) ? jsonrpc_params.id : nil
+          return render_not_found("Session not found.", id)
         elsif session.status == "closed"
-          return render_not_found("Session has been terminated.")
+          id = jsonrpc_params.respond_to?(:id) ? jsonrpc_params.id : nil
+          return render_not_found("Session has been terminated.", id)
         end
       end
 
@@ -188,7 +193,8 @@ module ActionMCP
       end
     rescue StandardError => e
       Rails.logger.error "Unified POST Error: #{e.class} - #{e.message}\n#{e.backtrace.join("\n")}"
-      render_internal_server_error("An unexpected error occurred.") unless performed?
+      id = jsonrpc_params.respond_to?(:id) ? jsonrpc_params.id : nil rescue nil
+      render_internal_server_error("An unexpected error occurred.", id) unless performed?
     end
 
     # Handles DELETE requests for session termination (2025-03-26 spec).
@@ -259,7 +265,7 @@ module ActionMCP
         # Session protocol version is set during initialization and should not be overridden
         session
       else
-        Server.session_store.create_session(nil, protocol_version: self.class::REQUIRED_PROTOCOL_VERSION)
+        Server.session_store.create_session(nil, protocol_version: ActionMCP::DEFAULT_PROTOCOL_VERSION)
       end
     end
 
@@ -404,33 +410,58 @@ module ActionMCP
     # --- Error Rendering Methods ---
 
     # Renders a 400 Bad Request response with a JSON-RPC-like error structure.
-    def render_bad_request(message = "Bad Request")
-      render json: { jsonrpc: "2.0", error: { code: -32_600, message: message } }
+    def render_bad_request(message = "Bad Request", id = nil)
+      id ||= extract_jsonrpc_id_from_request
+      render json: { jsonrpc: "2.0", id: id, error: { code: -32_600, message: message } }
     end
 
     # Renders a 404 Not Found response with a JSON-RPC-like error structure.
-    def render_not_found(message = "Not Found")
-      render json: { jsonrpc: "2.0", error: { code: -32_001, message: message } }
+    def render_not_found(message = "Not Found", id = nil)
+      id ||= extract_jsonrpc_id_from_request
+      render json: { jsonrpc: "2.0", id: id, error: { code: -32_001, message: message } }
     end
 
     # Renders a 405 Method Not Allowed response.
-    def render_method_not_allowed(message = "Method Not Allowed")
-      render json: { jsonrpc: "2.0", error: { code: -32_601, message: message } }
+    def render_method_not_allowed(message = "Method Not Allowed", id = nil)
+      id ||= extract_jsonrpc_id_from_request
+      render json: { jsonrpc: "2.0", id: id, error: { code: -32_601, message: message } }
     end
 
     # Renders a 406 Not Acceptable response.
-    def render_not_acceptable(message = "Not Acceptable")
-      render json: { jsonrpc: "2.0", error: { code: -32_002, message: message } }
+    def render_not_acceptable(message = "Not Acceptable", id = nil)
+      id ||= extract_jsonrpc_id_from_request
+      render json: { jsonrpc: "2.0", id: id, error: { code: -32_002, message: message } }
     end
 
     # Renders a 501 Not Implemented response.
-    def render_not_implemented(message = "Not Implemented")
-      render json: { jsonrpc: "2.0", error: { code: -32_003, message: message } }
+    def render_not_implemented(message = "Not Implemented", id = nil)
+      id ||= extract_jsonrpc_id_from_request
+      render json: { jsonrpc: "2.0", id: id, error: { code: -32_003, message: message } }
     end
 
     # Renders a 500 Internal Server Error response.
     def render_internal_server_error(message = "Internal Server Error", id = nil)
       render json: { jsonrpc: "2.0", id: id, error: { code: -32_000, message: message } }
     end
+
+    # Extract JSON-RPC ID from request
+    def extract_jsonrpc_id_from_request
+      # Try to get from already parsed jsonrpc_params first
+      if defined?(jsonrpc_params) && jsonrpc_params
+        return jsonrpc_params.respond_to?(:id) ? jsonrpc_params.id : nil
+      end
+
+      # Otherwise try to parse from raw body, this need refactoring
+      return nil unless request.post? && request.content_type&.include?("application/json")
+
+      begin
+        body = request.body.read
+        request.body.rewind # Reset for subsequent reads
+        json = JSON.parse(body)
+        json["id"]
+      rescue JSON::ParserError, StandardError
+        nil
+      end
+    end
   end
 end

data/app/models/action_mcp/session.rb

@@ -75,7 +75,7 @@ module ActionMCP
     before_create :set_server_info, if: -> { role == "server" }
     before_create :set_server_capabilities, if: -> { role == "server" }
 
-    validates :protocol_version, inclusion: { in: SUPPORTED_VERSIONS }, allow_nil: true, unless: lambda {
+    validates :protocol_version, inclusion: { in: ActionMCP::SUPPORTED_VERSIONS }, allow_nil: true, unless: lambda {
       ActionMCP.configuration.vibed_ignore_version
     }
 
@@ -130,7 +130,7 @@ module ActionMCP
 
     def server_capabilities_payload
       {
-        protocolVersion: PROTOCOL_VERSION,
+        protocolVersion: protocol_version || ActionMCP::DEFAULT_PROTOCOL_VERSION,
         serverInfo: server_info,
         capabilities: server_capabilities
       }

data/lib/action_mcp/client/base.rb

@@ -180,7 +180,7 @@ module ActionMCP
         end
 
         params = {
-          protocolVersion: PROTOCOL_VERSION,
+          protocolVersion: ActionMCP::DEFAULT_PROTOCOL_VERSION,
           capabilities: client_capabilities,
           clientInfo: client_info
         }

data/lib/action_mcp/client/json_rpc_handler.rb

@@ -180,7 +180,7 @@ module ActionMCP
           # Create a new session with the server-provided ID
           client.instance_variable_set(:@session, ActionMCP::Session.from_client.new(
             id: session_id,
-            protocol_version: result["protocolVersion"] || PROTOCOL_VERSION,
+            protocol_version: result["protocolVersion"] || ActionMCP::DEFAULT_PROTOCOL_VERSION,
             client_info: client.client_info,
             client_capabilities: client.client_capabilities,
             server_info: result["serverInfo"],

data/lib/action_mcp/configuration.rb

@@ -67,7 +67,7 @@ module ActionMCP
 
       @sse_heartbeat_interval = 30
       @post_response_preference = :json
-      @protocol_version = "2025-03-26"
+      @protocol_version = "2025-03-26"  # Default to legacy for backwards compatibility
       @vibed_ignore_version = false
 
       # Resumability defaults

data/lib/action_mcp/server/capabilities.rb

@@ -45,7 +45,7 @@ module ActionMCP
             # Return existing session info
             capabilities_payload = existing_session.server_capabilities_payload
             capabilities_payload[:protocolVersion] = if ActionMCP.configuration.vibed_ignore_version
-                                                       PROTOCOL_VERSION
+                                                       ActionMCP::LATEST_VERSION
             else
                                                        client_protocol_version
             end
@@ -66,7 +66,7 @@ module ActionMCP
 
         capabilities_payload = session.server_capabilities_payload
         capabilities_payload[:protocolVersion] = if ActionMCP.configuration.vibed_ignore_version
-                                                   PROTOCOL_VERSION
+                                                   ActionMCP::LATEST_VERSION
         else
                                                    client_protocol_version
         end

data/lib/action_mcp/server/memory_session.rb

@@ -175,14 +175,14 @@ module ActionMCP
       # Capability methods
       def server_capabilities_payload
         {
-          protocolVersion: ActionMCP::PROTOCOL_VERSION,
+          protocolVersion: ActionMCP::LATEST_VERSION,
           serverInfo: server_info,
           capabilities: server_capabilities
         }
       end
 
       def set_protocol_version(version)
-        version = ActionMCP::PROTOCOL_VERSION if ActionMCP.configuration.vibed_ignore_version
+        version = ActionMCP::LATEST_VERSION if ActionMCP.configuration.vibed_ignore_version
         self.protocol_version = version
         save
       end

data/lib/action_mcp/version.rb

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

data/lib/action_mcp.rb

@@ -37,9 +37,15 @@ module ActionMCP
   require_relative "action_mcp/version"
   require_relative "action_mcp/client"
   include Logging
-  PROTOCOL_VERSION = "2025-03-26"  # Default version
-  CURRENT_VERSION = "2025-03-26"   # Current version
-  SUPPORTED_VERSIONS = %w[2025-06-18 2025-03-26].freeze
+
+  # Protocol version constants
+  SUPPORTED_VERSIONS = [
+    "2025-06-18", # Dr. Identity McBouncer - OAuth 2.1, elicitation, structured output, resource links
+    "2025-03-26"  # The Persistent Negotiator - StreamableHTTP, resumability, audio support
+  ].freeze
+
+  LATEST_VERSION = SUPPORTED_VERSIONS.first.freeze
+  DEFAULT_PROTOCOL_VERSION = "2025-03-26".freeze  # Default to initial stable version for backwards compatibility
   class << self
     # Returns a Rack-compatible application for serving MCP requests
     # This makes ActionMCP.server work similar to ActionCable.server

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmcp
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.60.1
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement