actionmcp 0.111.1 → 0.200.0

data/app/jobs/action_mcp/tool_execution_job.rb

@@ -45,16 +45,20 @@ module ActionMCP
         return nil
       end
 
-      task.record_step!(:job_started)
+      task.with_lock do
+        task.record_step!(:job_started) unless task.terminal?
+      end
       task
     end
 
     def validate_session(task)
       session = task.session
       unless session
-        task.update(status_message: "Session not found")
-        task.result_payload = { code: -32_603, message: "Session not found" }
-        task.mark_failed!
+        fail_task(
+          task,
+          status_message: "Session not found",
+          result_payload: { code: -32_603, message: "Session not found" }
+        )
         return nil
       end
 
@@ -64,17 +68,19 @@ module ActionMCP
     def prepare_tool(session, tool_name, arguments, task)
       tool_class = session.registered_tools.find { |t| t.tool_name == tool_name }
       unless tool_class
-        @task.update(status_message: "Tool '#{tool_name}' not found")
-        @task.result_payload = {
-          code: -32_601,
-          message: "Tool '#{tool_name}' not found"
-        }
-        @task.mark_failed!
+        fail_task(
+          task,
+          status_message: "Tool '#{tool_name}' not found",
+          result_payload: {
+            code: -32_601,
+            message: "Tool '#{tool_name}' not found"
+          }
+        )
         return nil
       end
 
       # Create and configure tool instance
-      tool = tool_class.new(arguments)
+      tool = tool_class.from_wire(arguments)
       tool.with_context({
         session: session,
         request: {
@@ -85,6 +91,25 @@ module ActionMCP
       tool.instance_variable_set(:@_task, task)
 
       tool
+    rescue ArgumentError, ActiveModel::UnknownAttributeError => e
+      fail_task(
+        task,
+        status_message: "Invalid tool input",
+        result_payload: Server::ToolResult.execution_error(e.message).to_h
+      )
+      nil
+    end
+
+    def fail_task(task, status_message:, result_payload:)
+      task.with_lock do
+        return false if task.terminal?
+
+        task.status_message = status_message
+        task.result_payload = result_payload
+        task.mark_failed!
+      end
+
+      true
     end
 
     def execute_with_reloader(tool, session)
@@ -104,17 +129,21 @@ module ActionMCP
     end
 
     def update_task_result(task, result)
-      return if task.terminal? # Guard against double-complete
-
+      result = Server::ToolResult.normalize(result)
       payload = result.to_h
-      if result.is_error || payload[:isError] || payload["isError"]
-        task.result_payload = payload
-        task.status_message = result.respond_to?(:error_message) ? result.error_message : "Tool returned error"
-        task.mark_failed!
-      else
-        task.result_payload = payload
-        task.record_step!(:completed)
-        task.complete!
+
+      task.with_lock do
+        return if task.terminal?
+
+        if result.is_error || payload[:isError] || payload["isError"]
+          task.result_payload = payload
+          task.status_message = result.respond_to?(:error_message) ? result.error_message : "Tool returned error"
+          task.mark_failed!
+        else
+          task.result_payload = payload
+          task.record_step!(:completed)
+          task.complete!
+        end
       end
     end
 
@@ -122,24 +151,27 @@ module ActionMCP
       task_id = job.arguments.first
       task = Session::Task.find_by(id: task_id)
       return unless task&.persisted?
-      return if task.terminal?
 
       Rails.logger.error "[ToolExecutionJob] Discarding job for task #{task_id}: #{error.class} - #{error.message}"
       Rails.logger.error error.backtrace&.first(10)&.join("\n")
 
-      task.update(
-        status_message: "Job failed: #{error.message}",
-        result_payload: {
-          code: -32_603,
-          message: "Job failed: #{error.message}"
-        },
-        continuation_state: {
-          step: :failed,
-          error: { class: error.class.name, message: error.message },
-          timestamp: Time.current.iso8601
-        }
-      )
-      task.mark_failed!
+      task.with_lock do
+        return if task.terminal?
+
+        task.update!(
+          status_message: "Job failed: #{error.message}",
+          result_payload: {
+            code: -32_603,
+            message: "Job failed: #{error.message}"
+          },
+          continuation_state: {
+            step: :failed,
+            error: { class: error.class.name, message: error.message },
+            timestamp: Time.current.iso8601
+          }
+        )
+        task.mark_failed!
+      end
     end
   end
 end

data/app/models/action_mcp/session/message.rb

@@ -142,10 +142,11 @@ module ActionMCP
       def acknowledge_request
         return unless jsonrpc_id.present?
 
-        request_message = session.messages.find_by(
+        request_message = session.messages.where(
           jsonrpc_id: jsonrpc_id,
-          message_type: "request"
-        )
+          message_type: "request",
+          direction: opposite_direction
+        ).order(created_at: :desc).find { |message| message.data["id"] == data["id"] }
 
         return unless request_message
 
@@ -157,6 +158,10 @@ module ActionMCP
 
         save! if changed?
       end
+
+      def opposite_direction
+        direction == "server" ? "client" : "server"
+      end
     end
   end
 end

data/app/models/action_mcp/session/task.rb

@@ -142,7 +142,7 @@ module ActionMCP
       end
 
       def result_ready?
-        terminal? || input_required?
+        terminal?
       end
 
       # Check if task is in a non-terminal state
@@ -274,16 +274,26 @@ module ActionMCP
       # @param prompt [String] The prompt/question for the user
       # @param context [Hash] Additional context about the input request
       def await_input!(prompt:, context: {})
-        record_step!(:awaiting_input, data: { prompt: prompt, context: context })
-        require_input!
+        with_lock do
+          return false if terminal?
+
+          record_step!(:awaiting_input, data: { prompt: prompt, context: context })
+          require_input!
+        end
       end
 
       # Resume task from input_required state and re-enqueue job
       # @return [void]
       def resume_from_continuation!
-        return unless input_required?
+        resumed = false
+        with_lock do
+          next unless input_required?
+
+          resume!
+          resumed = true
+        end
+        return unless resumed
 
-        resume!
         # Re-enqueue the job to continue execution
         ActionMCP::ToolExecutionJob.perform_later(id, request_name, request_params, {})
       end

data/app/models/action_mcp/session.rb

@@ -43,7 +43,7 @@ module ActionMCP
     end
 
     include MCPConsoleHelpers
-    attribute :id, :string, default: -> { SecureRandom.hex(6) }
+    attribute :id, :string, default: -> { SecureRandom.hex(16) }
     has_many :messages,
              class_name: "ActionMCP::Session::Message",
              foreign_key: "session_id",
@@ -98,6 +98,46 @@ module ActionMCP
       messages.create!(data: data, direction: role)
     end
 
+    # Marks an in-flight request received from the peer as cancelled. JSON-RPC
+    # IDs are scoped by direction, so an outbound request with the same ID must
+    # never be selected here.
+    def cancel_in_flight_request(request_id)
+      return if request_id.nil?
+
+      request = received_requests_with_id(request_id).find do |message|
+        !message.request_acknowledged? && !message.request_cancelled?
+      end
+      return if request&.rpc_method == JsonRpcHandlerBase::Methods::INITIALIZE
+
+      request&.tap { |message| message.update!(request_cancelled: true) }
+    end
+
+    # Locates the server-originated client request associated with a progress
+    # token. This is intentionally limited to MCP client request methods that
+    # ActionMCP can issue.
+    def client_request_for_progress(progress_token)
+      return if progress_token.nil?
+
+      issued_client_requests.find do |request|
+        request.data.dig("params", "_meta", "progressToken") == progress_token &&
+          client_request_accepts_progress?(request)
+      end
+    end
+
+    # Locates the task-augmented client request which created +task_id+.
+    def client_request_for_task(task_id)
+      return unless task_id.is_a?(String) && task_id.present?
+
+      response = messages.responses.where(direction: role).order(created_at: :desc).find do |message|
+        message.data.dig("result", "task", "taskId") == task_id
+      end
+      return unless response
+
+      issued_client_requests_with_id(response.data["id"]).find do |request|
+        request.data.dig("params", "task").is_a?(Hash)
+      end
+    end
+
     def set_protocol_version(version)
       update(protocol_version: version)
     end
@@ -132,24 +172,17 @@ module ActionMCP
 
     def capabilities_for_protocol(capabilities)
       parsed = parsed_json_attribute(capabilities)
-      filtered =
-        if parsed.respond_to?(:deep_dup)
-          parsed.deep_dup
-        elsif parsed
-          parsed.dup
-        else
-          {}
-        end
-      return filtered if protocol_version == "2025-11-25"
+      parsed ? parsed.deep_dup : {}
+    end
+
+    def begin_initialization!
+      return false unless status == "pre_initialize" && !initialized?
 
-      filtered.delete("tasks")
-      filtered.delete(:tasks)
-      filtered
+      update(status: "initializing")
     end
 
     def initialize!
-      # update the session initialized to true
-      return false if initialized?
+      return false unless status == "initializing" && !initialized?
 
       self.initialized = true
       self.status = "initialized"
@@ -170,6 +203,10 @@ module ActionMCP
       subscriptions.find_by(uri: uri)&.destroy
     end
 
+    def resource_subscribed?(uri)
+      subscriptions.exists?(uri: uri)
+    end
+
     def send_progress_notification(progressToken:, progress:, total: nil, message: nil)
       # Create a transport handler to send the notification
       handler = ActionMCP::Server::TransportHandler.new(self)
@@ -181,10 +218,6 @@ module ActionMCP
       )
     end
 
-    def send_progress_notification_legacy(token:, value:, message: nil)
-      send_progress_notification(progressToken: token, progress: value, message: message)
-    end
-
     # Registry management methods
     def register_tool(tool_class_or_name)
       tool_name = normalize_name(tool_class_or_name, :tool)
@@ -361,6 +394,47 @@ module ActionMCP
 
     private
 
+    CLIENT_REQUEST_METHODS = %w[sampling/createMessage elicitation/create].freeze
+    TERMINAL_CLIENT_TASK_STATUSES = %w[cancelled completed failed].freeze
+
+    def received_requests_with_id(request_id)
+      messages.requests
+        .where(direction: role, jsonrpc_id: request_id.to_s)
+        .order(created_at: :desc)
+        .select { |message| message.data["id"] == request_id }
+    end
+
+    def issued_client_requests
+      messages.requests.where(direction: writer_role).order(created_at: :desc).select do |message|
+        CLIENT_REQUEST_METHODS.include?(message.rpc_method)
+      end
+    end
+
+    def issued_client_requests_with_id(request_id)
+      issued_client_requests.select { |message| message.data["id"] == request_id }
+    end
+
+    def client_request_accepts_progress?(request)
+      return true unless request.request_acknowledged?
+
+      response = messages.responses
+        .where(direction: role, jsonrpc_id: request.jsonrpc_id)
+        .order(created_at: :desc)
+        .find { |message| message.data["id"] == request.data["id"] }
+      task = response&.data&.dig("result", "task")
+      return false unless task.is_a?(Hash) && task["taskId"].is_a?(String)
+
+      latest_status = messages.notifications.where(direction: role).order(created_at: :desc).filter_map do |message|
+        params = message.data["params"]
+        next unless message.data["method"] == JsonRpcHandlerBase::Methods::NOTIFICATIONS_TASKS_STATUS
+        next unless params.is_a?(Hash) && params["taskId"] == task["taskId"]
+
+        params["status"]
+      end.first
+
+      !TERMINAL_CLIENT_TASK_STATUSES.include?(latest_status || task["status"])
+    end
+
     # if this session is from a server, the writer is the client
     def writer_role
       role == "server" ? "client" : "server"

data/config/routes.rb

@@ -3,7 +3,7 @@
 ActionMCP::Engine.routes.draw do
   get "#{ActionMCP.configuration.base_path}/up", to: "/rails/health#show", as: :action_mcp_health_check
 
-  # MCP 2025-03-26 Spec routes
+  # MCP 2025-11-25 Streamable HTTP routes
   get ActionMCP.configuration.base_path, to: "application#show", as: :mcp_get
   post ActionMCP.configuration.base_path, to: "application#create", as: :mcp_post
   delete ActionMCP.configuration.base_path, to: "application#destroy", as: :mcp_delete

data/lib/action_mcp/apps/javascript/ext_apps.LICENSE

@@ -0,0 +1,216 @@
+The MCP project is undergoing a licensing transition from the MIT License to the Apache License, Version 2.0 ("Apache-2.0"). All new code and specification contributions to the project are licensed under Apache-2.0. Documentation contributions (excluding specifications) are licensed under CC-BY-4.0.
+
+Contributions for which relicensing consent has been obtained are licensed under Apache-2.0. Contributions made by authors who originally licensed their work under the MIT License and who have not yet granted explicit permission to relicense remain licensed under the MIT License.
+
+No rights beyond those granted by the applicable original license are conveyed for such contributions.
+
+---
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to the Licensor for inclusion in the Work by the copyright
+      owner or by an individual or Legal Entity authorized to submit on behalf
+      of the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+---
+
+MIT License
+
+Copyright (c) 2024-2025 Model Context Protocol a Series of LF Projects, LLC.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---
+
+Creative Commons Attribution 4.0 International (CC-BY-4.0)
+
+Documentation in this project (excluding specifications) is licensed under
+CC-BY-4.0. See https://creativecommons.org/licenses/by/4.0/legalcode for
+the full license text.