actionmcp 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e868fd86b80e0692fd07f6ad8c1654689a38487884e0cb9c171bfeeb5fd8bb3d
-  data.tar.gz: 238d565acbf9351109c6a86ba8f275dc2c3b02673ecccbb398aa21a6bc583799
+  metadata.gz: 7a031f1969028d88d34f7f19bc18777fee99067dee692ce73754bbb001477f14
+  data.tar.gz: 35c84b344020e97ce87d9c7e033220138732c29bd7d7cee0634e4f9c7f38cc13
 SHA512:
-  metadata.gz: f02103ba1907abdeb1944deb0d0af21ba24055034e0313f1641b8ee6ede4478a23fd680a9643317092a663284a029a29e9d5906aba550eba019a469114ebff29
-  data.tar.gz: 416958613078722d30a36f3b74dee4efe62f5c2319f9d88a35b1e43b2f401fb04a83187d9b09a750a49b3e6281adca850c6c65980758b06902d632599850f79f
+  metadata.gz: 953dd645cb4006c027ca2643aa8274a5011db73910159f4a0a3d5c60e80df82deae14f37ec41de869e863e7b4a8e1440579863bc33daa21185dc169abc4ddcbe
+  data.tar.gz: 22f1e9622b4330afb13bc1fd943142904f8fcbd07df734e571707c428b2d11c343775900221a33a74df354cae4a47fa36bd13e97d3809aa930b4ad2af40b66b5

data/app/controllers/action_mcp/messages_controller.rb

@@ -21,6 +21,9 @@ module ActionMCP
     end
 
     def handle_post_message(params, response)
+      if params[:method] == "initialize"
+        mcp_session.initialize!
+      end
       json_rpc_handler.call(params)
 
       response.status = :accepted
@@ -31,7 +34,7 @@ module ActionMCP
     end
 
     def mcp_session
-      Session.find(params[:session_id])
+      @mcp_session ||= Session.find_or_create_by(id: params[:session_id])
     end
 
     def clean_params

data/app/controllers/action_mcp/sse_controller.rb

@@ -1,7 +1,6 @@
 module ActionMCP
   class SSEController < ApplicationController
     HEARTBEAT_INTERVAL = 30 # TODO: The frequency of pings SHOULD be configurable
-    INITIALIZATION_TIMEOUT = 2
     include ActionController::Live
 
     # @route GET /sse (sse_out)
@@ -21,12 +20,21 @@ module ActionMCP
 
         # Start listener and process messages via the transport
         listener = SSEListener.new(mcp_session)
+        message_received = false
         if listener.start do |message|
           # Send with proper SSE formatting
           sse.write(message)
+          message_received = true
+        end
+        sleep 1
+        # Heartbeat loop
+        unless message_received
+          Rails.logger.warn "No message received within 1 second, closing connection for session: #{session_id}"
+          error = JsonRpc::Response.new(id: SecureRandom.uuid_v7, error: JsonRpc::JsonRpcError.new(:server_error, message: "No message received within 1 second").to_h).to_h
+          sse.write(error)
+          return
         end
 
-          # Heartbeat loop
           until response.stream.closed?
             sleep HEARTBEAT_INTERVAL
             # mcp_session.send_ping!
@@ -40,8 +48,8 @@ module ActionMCP
       rescue => e
         Rails.logger.error "SSE: Unexpected error: #{e.class} - #{e.message}\n#{e.backtrace.join("\n")}"
       ensure
-        listener.stop
         response.stream.close
+        listener.stop
         Rails.logger.debug "SSE: Connection closed for session: #{session_id}"
       end
     end
@@ -60,12 +68,16 @@ module ActionMCP
     end
 
     def mcp_session
-      @mcp_session ||= Session.create
+      @mcp_session ||= Session.new
     end
 
     def session_id
       @session_id ||= mcp_session.id
     end
+
+    def cache_key
+      "action_mcp:session:#{session_id}"
+    end
   end
 
   class SSEListener
@@ -101,7 +113,7 @@ module ActionMCP
       }
 
       # Subscribe using the ActionCable adapter
-      success = adapter.subscribe(session_key, message_callback, success_callback)
+      adapter.subscribe(session_key, message_callback, success_callback)
 
       # Give some time for the subscription to be established
       sleep 0.5
@@ -111,8 +123,9 @@ module ActionMCP
 
     def stop
       @stopped = true
-
-      @session.close!
+      if (mcp_session = Session.find_by(id: session_key))
+        mcp_session.close
+      end
       Rails.logger.debug "Unsubscribed from: #{session_key}"
     end
   end

data/lib/action_mcp/engine.rb

@@ -15,6 +15,10 @@ module ActionMCP
     # Provide a configuration namespace for ActionMCP
     config.action_mcp = ActionMCP.configuration
 
+    config.to_prepare do
+      ActionMCP::ResourceTemplate.registered_templates.clear
+    end
+
     # Configure autoloading for the mcp/tools directory
     initializer "action_mcp.autoloading", before: :set_autoload_paths do |app|
       mcp_path = app.root.join("app/mcp")

data/lib/action_mcp/resource_template.rb

@@ -179,6 +179,8 @@ module ActionMCP
         ResourceTemplate.registered_templates.each do |registered_class|
           next if registered_class == self || registered_class.abstract?
           next unless registered_class.uri_template
+          # Ignore conflicts with resource templates that have the same name
+          next if registered_class.name == self.name
 
           existing_template_data = parse_uri_template(registered_class.uri_template)
 

data/lib/action_mcp/tool.rb

@@ -74,7 +74,7 @@ module ActionMCP
 
       return unless %w[number integer].include?(type)
 
-      validates prop_name, numericality: true
+      validates prop_name, numericality: true, allow_nil: true
     end
 
     # --------------------------------------------------------------------------

data/lib/action_mcp/version.rb

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

metadata

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