actionmcp 0.7.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bea2e23118051ba1a05eb00dfb44395841068fe6358b341e01a1951f7064a259
-  data.tar.gz: e1ff02d641a4684c0369fa252139edeb8bf1dae41193deeca122832bcb0ac318
+  metadata.gz: a310c4bc57df9c1cd4d0fceb7b80fd9628414609bb6131e5d420584f5605f59c
+  data.tar.gz: 881fb9d39845277adcb24d42e73475dfc9aca5e25afb2b049c5ee55446aca474
 SHA512:
-  metadata.gz: '097b59b77ef2028887ef159f211a314a9a9fa83edb7ff26f50d62fc56a834bf5df96e7781c5cd715d511ee957736f242971f76baac3d8b1fffd213f6373afe5c'
-  data.tar.gz: 13582b839164819da648df7e319df9e8aac565f2792bee75c44d23d1fd7af531e01d6c7a8e82f63d46fc9cd68f7d42fe10622748202a6ca10dc99ff332d8d7a5
+  metadata.gz: 7e4caed2e47ffb767e8c6980a07542d093cc5bb7dd1d0438c342e0ec7a9c6af56e0409b108955b229f0fa4147d263a3060ce72a2864f7dc5405aab9f28e66bf6
+  data.tar.gz: ddb5fa89098629fecd125c317d935a0d0f3e4d50d828f4cd5d3b1c4b435be648b973235961af62e566431d1f991d4f3f0e11aeb7812b6423e0e4186cb4785b73

data/README.md

@@ -105,7 +105,8 @@ bin/rails generate action_mcp:prompt AnalyzeCode
 This command will create a file at `app/mcp/prompts/analyze_code_prompt.rb` with content similar to:
 
 ```ruby
-class AnalyzeCodePrompt < ApplicationPrompt
+
+class AnalyzeCodePrompt < ApplicationMCPPrompt
   # Override the prompt_name (otherwise we'd get "analyze_code")
   prompt_name "analyze-code"
 
@@ -118,7 +119,7 @@ class AnalyzeCodePrompt < ApplicationPrompt
 
   # Add validations
   validates :language, inclusion: { in: %w[Ruby C Cobol FORTRAN] }
-  
+
   def call
     # Implement your prompt logic here
     render(text: "Analyzing #{language} code: #{code}")
@@ -137,7 +138,7 @@ bin/rails generate action_mcp:tool CalculateSum
 This command will create a file at `app/mcp/tools/calculate_sum_tool.rb` with content similar to:
 
 ```ruby
-class CalculateSumTool < ApplicationTool
+class CalculateSumTool < ApplicationMCPTool
   tool_name "calculate_sum"
   description "Calculate the sum of two numbers"
 

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

@@ -20,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!
@@ -39,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
@@ -59,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
@@ -100,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
@@ -110,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/app/models/action_mcp/session/message.rb

@@ -1,4 +1,34 @@
+# == Schema Information
+#
+# Table name: action_mcp_session_messages
+#
+#  id                                     :bigint           not null, primary key
+#  direction(The message recipient)       :string           default("client"), not null
+#  is_ping(Whether the message is a ping) :boolean          default(FALSE), not null
+#  message_json                           :jsonb
+#  message_text                           :string
+#  message_type(The type of the message)  :string           not null
+#  request_acknowledged                   :boolean          default(FALSE), not null
+#  request_cancelled                      :boolean          default(FALSE), not null
+#  created_at                             :datetime         not null
+#  updated_at                             :datetime         not null
+#  jsonrpc_id                             :string
+#  session_id                             :string           not null
+#
+# Indexes
+#
+#  index_action_mcp_session_messages_on_session_id  (session_id)
+#
+# Foreign Keys
+#
+#  fk_action_mcp_session_messages_session_id  (session_id => action_mcp_sessions.id) ON DELETE => cascade ON UPDATE => cascade
+#
 module ActionMCP
+  ##
+  # Represents a message exchanged during an MCP session.
+  # Its role is to store the content and metadata of each message,
+  # including the direction (client or server), message type (request, response, notification),
+  # and any associated JSON-RPC ID.
   class Session::Message < ApplicationRecord
     belongs_to :session,
                class_name: "ActionMCP::Session",
@@ -99,7 +129,7 @@ module ActionMCP
       )
       if request_message&.is_ping
         self.is_ping = true
-        request_message.update(ping_acknowledged: true)
+        request_message.update(request_acknowledged: true)
         save! if changed?
       end
     end

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

@@ -0,0 +1,33 @@
+# == Schema Information
+#
+# Table name: action_mcp_session_resources
+#
+#  id               :bigint           not null, primary key
+#  created_by_tool  :boolean          default(FALSE)
+#  description      :text
+#  last_accessed_at :datetime
+#  metadata         :json
+#  mime_type        :string           not null
+#  name             :string
+#  uri              :string           not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  session_id       :string           not null
+#
+# Indexes
+#
+#  index_action_mcp_session_resources_on_session_id  (session_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (session_id => action_mcp_sessions.id) ON DELETE => cascade
+#
+module ActionMCP
+  ##
+  # Represents a resource associated with an MCP session.
+  # Its role is to store information about a resource, such as its URI, MIME type, description,
+  # and any associated metadata. It also tracks whether the resource was created by a tool and the last time it was accessed.
+  class Session::Resource < ApplicationRecord
+    belongs_to :session
+  end
+end

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

@@ -0,0 +1,30 @@
+# == Schema Information
+#
+# Table name: action_mcp_session_subscriptions
+#
+#  id                   :bigint           not null, primary key
+#  last_notification_at :datetime
+#  uri                  :string           not null
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#  session_id           :string           not null
+#
+# Indexes
+#
+#  index_action_mcp_session_subscriptions_on_session_id  (session_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (session_id => action_mcp_sessions.id) ON DELETE => cascade
+#
+module ActionMCP
+  #
+  # Represents a client's subscription to a resource for real-time updates.
+  # Its role is to store the URI of the resource being subscribed to and track the last time a notification was sent for the subscription.
+  # All Subscriptions are deleted when the session is closed.
+  class Session::Subscription < ApplicationRecord
+      belongs_to :session,
+                 class_name: "ActionMCP::Session",
+                 inverse_of: :subscriptions
+  end
+end

data/app/models/action_mcp/session.rb

@@ -1,11 +1,44 @@
+# == Schema Information
+#
+# Table name: action_mcp_sessions
+#
+#  id                                                  :string           not null, primary key
+#  client_capabilities(The capabilities of the client) :jsonb
+#  client_info(The information about the client)       :jsonb
+#  ended_at(The time the session ended)                :datetime
+#  initialized                                         :boolean          default(FALSE), not null
+#  messages_count                                      :integer          default(0), not null
+#  protocol_version                                    :string
+#  role(The role of the session)                       :string           default("server"), not null
+#  server_capabilities(The capabilities of the server) :jsonb
+#  server_info(The information about the server)       :jsonb
+#  status                                              :string           default("pre_initialize"), not null
+#  created_at                                          :datetime         not null
+#  updated_at                                          :datetime         not null
+#
 module ActionMCP
+  ##
+  # Represents an MCP session, which is a connection between a client and a server.
+  # Its role is to manage the communication channel and store information about the session,
+  # such as client and server capabilities, protocol version, and session status.
+  # It also manages the association with messages and subscriptions related to the session.
   class Session < ApplicationRecord
     attribute :id, :string, default: -> { SecureRandom.hex(6) }
     has_many :messages,
              class_name: "ActionMCP::Session::Message",
              foreign_key: "session_id",
-             dependent: :destroy,
+             dependent: :delete_all,
              inverse_of: :session
+    has_many :subscriptions,
+              class_name: "ActionMCP::Session::Subscription",
+              foreign_key: "session_id",
+              dependent: :delete_all,
+              inverse_of: :session
+    has_many :resources,
+              class_name: "ActionMCP::Session::Resource",
+              foreign_key: "session_id",
+              dependent: :delete_all,
+              inverse_of: :session
 
     scope :pre_initialize, -> { where(status: "pre_initialize") }
     scope :closed, -> { where(status: "closed") }
@@ -20,6 +53,7 @@ module ActionMCP
       dummy_callback = ->(*) { } # this callback seem broken
       adapter.unsubscribe(session_key, dummy_callback)
       update!(status: "closed", ended_at: Time.zone.now)
+      subscriptions.delete_all # delete all subscriptions
     end
 
     def write(data)

data/db/migrate/20250316005021_create_action_mcp_session_subscriptions.rb

@@ -0,0 +1,14 @@
+class CreateActionMCPSessionSubscriptions < ActiveRecord::Migration[8.0]
+  def change
+    create_table :action_mcp_session_subscriptions do |t|
+      t.references :session,
+                   null: false,
+                   foreign_key: { to_table: :action_mcp_sessions, on_delete: :cascade },
+                    type: :string
+      t.string :uri, null: false
+      t.datetime :last_notification_at
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250316005649_create_action_mcp_session_resources.rb

@@ -0,0 +1,23 @@
+class CreateActionMCPSessionResources < ActiveRecord::Migration[8.0]
+  def change
+    create_table :action_mcp_session_resources do |t|
+      t.references :session,
+                   null: false,
+                   foreign_key: { to_table: :action_mcp_sessions, on_delete: :cascade },
+                   type: :string
+      t.string :uri, null: false
+      t.string :name
+      t.text :description
+      t.string :mime_type, null: false
+      t.boolean :created_by_tool, default: false
+      t.datetime :last_accessed_at
+      t.json :metadata
+
+      t.timestamps
+    end
+    change_column_comment :action_mcp_session_messages, :direction, "The message recipient"
+    change_column_comment :action_mcp_session_messages, :is_ping, "Whether the message is a ping"
+    rename_column :action_mcp_session_messages, :ping_acknowledged, :request_acknowledged
+    add_column :action_mcp_session_messages, :request_cancelled, :boolean, null: false, default: false
+  end
+end

data/lib/action_mcp/prompt.rb

@@ -42,7 +42,6 @@ module ActionMCP
     # @param default [Object] The default value of the argument.
     # @param enum [Array<String>] The list of allowed values for the argument.
     # @return [void]
-    # Argument DSL
     def self.argument(arg_name, description: "", required: false, default: nil, enum: nil)
       arg_def = {
         name: arg_name.to_s,
@@ -88,47 +87,67 @@ module ActionMCP
     # validates it, and if valid, calls the instance call method.
     # If invalid, raises a JsonRpcError with code :invalid_params.
     #
-    # Usage:
-    #   result = MyPromptClass.call(params)
-    #
-    # Raises:
-    #   ActionMCP::JsonRpc::JsonRpcError(:invalid_params) if validation fails.
-    #
     # @param params [Hash] The parameters for the prompt.
-    # @return [Object] The result of the prompt's call method.
+    # @return [PromptResponse] The result of the prompt's call method.
     def self.call(params)
       prompt = new(params) # Initialize an instance with provided params
-      unless prompt.valid?
-        # Collect all validation errors into a single string or array
-        errors_str = prompt.errors.full_messages.join(", ")
-
-        raise ActionMCP::JsonRpc::JsonRpcError.new(
-          :invalid_params,
-          message: "Prompt validation failed: #{errors_str}",
-          data: { errors: prompt.errors }
-        )
-      end
 
       # If we reach here, the prompt is valid
       prompt.call
     end
 
     # ---------------------------------------------------
-    # Instance call method
+    # Instance Methods
     # ---------------------------------------------------
-    # By default, does nothing. Override in your subclasses to
-    # perform custom prompt processing. (Return a payload if needed)
-    #
-    # Usage: Called internally after validation in self.call
-    #
-    # @raise [NotImplementedError] Subclasses must implement the call method.
-    # @return [Array<Content>] Array of Content objects is expected as return value
+
+    # Public entry point for executing the prompt
+    # Returns a PromptResponse object containing messages
     def call
-      raise NotImplementedError, "Subclasses must implement the call method"
-      # Default implementation (no-op)
-      # In a real subclass, you might do:
-      #  # Perform logic, e.g. analyze code, etc.
-      #  # Return something meaningful.
+      @response = PromptResponse.new
+
+      # Check validations before proceeding
+      if valid?
+        begin
+          perform # Invoke the subclass-specific logic if valid
+        rescue => e
+          # Handle exceptions during execution
+          render text: "Error executing prompt: #{e.message}"
+        end
+      else
+        # Handle validation failure
+        render text: "Invalid input: #{errors.full_messages.join(', ')}"
+      end
+
+      @response # Return the response with collected messages
+    end
+
+    def inspect
+      attributes_hash = attributes.transform_values(&:inspect)
+
+      response_info = if defined?(@response) && @response
+                        "response: #{@response.messages.size} message(s)"
+      else
+                        "response: nil"
+      end
+
+      errors_info = errors.any? ? ", errors: #{errors.full_messages}" : ""
+
+      "#<#{self.class.name} #{attributes_hash.map { |k, v| "#{k}: #{v.inspect}" }.join(', ')}, #{response_info}#{errors_info}>"
+    end
+
+    # Override render to collect messages
+    def render(**args)
+      content = super(**args.slice(:text, :audio, :image, :resource, :mime_type, :blob))
+      @response.add_content(content, role: args.fetch(:role, "user")) # Add to the response
+      content # Return the content for potential use in perform
+    end
+
+    protected
+
+    # Abstract method for subclasses to implement their logic
+    # Expected to use render to produce Content objects or add_message for messages
+    def perform
+      raise NotImplementedError, "Subclasses must implement the perform method"
     end
   end
 end

data/lib/action_mcp/prompt_response.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module ActionMCP
+  class PromptResponse
+    attr_reader :messages, :description
+
+    def initialize
+      @messages = []
+    end
+
+    # Add a message to the response
+    def add_message(role:, content:)
+      @messages << { role: role, content: content }
+      self
+    end
+
+    # Add content directly (will be added as a user message)
+    def add_content(content, role:)
+      add_message(role: role, content: content.to_h)
+      self
+    end
+
+    # Convert to hash format expected by MCP protocol
+    def to_h
+      {
+        messages: @messages
+      }
+    end
+
+    # Alias to_h to as_json for consistency
+    alias_method :to_h, :as_json
+
+    # Handle to_json directly
+    def to_json(options = nil)
+      to_h.to_json(options)
+    end
+
+    # Pretty print for better debugging
+    def inspect
+      "#<#{self.class.name} messages: #{messages.size}"
+    end
+  end
+end

data/lib/action_mcp/renderable.rb

@@ -8,36 +8,27 @@ module ActionMCP
     # @param text [String, nil] Text content to render
     # @param audio [String, nil] Audio content to render
     # @param image [String, nil] Image content to render
-    # @param resource [String, nil] Resource content to render
-    # @param error [Array, nil] Array of error messages to render
+    # @param resource [String, nil] URI for resource content
     # @param mime_type [String, nil] MIME type for audio, image, or resource content
-    # @param uri [String, nil] URI for resource content
     # @param blob [String, nil] Binary data for resource content
     #
-    # @return [Content::Text, Content::Audio, Content::Image, Content::Resource, Hash]
-    #   The rendered content object or error hash
+    # @return [Content::Text, Content::Audio, Content::Image, Content::Resource]
+    #   The rendered content object
     #
     # @raise [ArgumentError] If no valid content parameters are provided
     #
     # @example Render text content
     #   render(text: "Hello, world!")
     #
-    # @example Render an error
-    #   render(error: ["Invalid input", "Please try again"])
-    def render(text: nil, audio: nil, image: nil, resource: nil, error: nil, mime_type: nil, uri: nil, blob: nil)
+    def render(text: nil, audio: nil, image: nil, resource: nil, mime_type: nil, blob: nil)
       if text
         Content::Text.new(text)
       elsif audio && mime_type
         Content::Audio.new(audio, mime_type)
       elsif image && mime_type
         Content::Image.new(image, mime_type)
-      elsif resource && uri && mime_type
-        Content::Resource.new(uri, mime_type, text: text, blob: blob)
-      elsif error
-        {
-          isError: true,
-          content: error.map { |e| render(text: e) }
-        }
+      elsif resource && mime_type
+        Content::Resource.new(resource, mime_type, text: text, blob: blob)
       else
         raise ArgumentError, "No content to render"
       end

data/lib/action_mcp/tool.rb

@@ -122,24 +122,67 @@ module ActionMCP
     # --------------------------------------------------------------------------
     # Instance Methods
     # --------------------------------------------------------------------------
-    # Abstract method to perform the tool's action.
-    #
-    # Subclasses must implement this method.
-    #
-    # @raise [NotImplementedError] Always raised if not implemented in a subclass.
-    # @return [Array<Content>] Array of Content objects is expected as return value
+
+    # Public entry point for executing the tool
+    # Returns an array of Content objects collected from render calls
     def call
-      raise NotImplementedError, "Subclasses must implement the call method"
-      # Default implementation (no-op)
-      # In a real subclass, you might do:
-      #   def call
-      #     # Perform logic, e.g. analyze code, etc.
-      #     # Array of Content objects is expected as return value
-      #   end
+      @response = ToolResponse.new # Create a new response for each invocation
+
+      # Check validations before proceeding
+      if valid?
+        begin
+          perform # Invoke the subclass-specific logic if valid
+        rescue => e
+          # Handle exceptions during execution
+          @response.mark_as_error!
+          render text: "Error executing tool: #{e.message}"
+        end
+      else
+        # Handle validation failure
+        @response.mark_as_error!
+        render text: "Invalid input: #{errors.full_messages.join(', ')}"
+      end
+
+      @response # Return the response with collected content
+    end
+
+    def inspect
+      attributes_hash = attributes.transform_values(&:inspect)
+
+      response_info = if defined?(@response) && @response
+                        "response: #{@response.contents.size} content(s), isError: #{@response.is_error}"
+      else
+                        "response: nil"
+      end
+
+      errors_info = errors.any? ? ", errors: #{errors.full_messages}" : ""
+
+      "#<#{self.class.name} #{attributes_hash.map { |k, v| "#{k}: #{v.inspect}" }.join(', ')}, #{response_info}#{errors_info}>"
+    end
+
+    # Override render to collect Content objects
+    def render(**args)
+      content = super(**args) # Call Renderable's render method
+      @response.add(content)  # Add to the response
+      content # Return the content for potential use in perform
+    end
+
+    protected
+
+    # Abstract method for subclasses to implement their logic
+    # Expected to use render to produce Content objects
+    def perform
+      raise NotImplementedError, "Subclasses must implement the perform method"
     end
 
     private
 
+    # Helper method for tools to manually report errors
+    def report_error(message)
+      @response.mark_as_error!
+      render text: message
+    end
+
     # Maps a JSON Schema type to an ActiveModel attribute type.
     #
     # @param type [String] The JSON Schema type.

data/lib/action_mcp/tool_response.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module ActionMCP
+  # Manages the collection of content objects for tool results
+  class ToolResponse
+    include Enumerable
+
+    attr_reader :contents, :is_error
+
+    delegate :empty?, :size, :each, :find, :map, to: :contents
+
+    def initialize(is_error: false)
+      @contents = []
+      @is_error = is_error
+    end
+
+    # Add content to the response
+    def add(content)
+      @contents << content
+      content # Return the content for chaining
+    end
+
+    # Mark response as error
+    def mark_as_error!
+      @is_error = true
+      self
+    end
+
+    # Convert to hash format expected by MCP protocol
+    def as_json(options = nil)
+      {
+        content: @contents.map { |c| c.as_json(options) },
+        isError: @is_error
+      }.compact
+    end
+
+    # Alias to_h to as_json for consistency
+    alias_method :to_h, :as_json
+
+    # Handle to_json directly
+    def to_json(options = nil)
+      as_json(options).to_json
+    end
+
+    # Compare with hash for easier testing
+    # This allows assertions like: assert_equal({content: [...], isError: false}, tool_response)
+    def ==(other)
+      case other
+      when Hash
+        # Compare our hash representation with the other hash
+        # Use deep symbolization to handle both string and symbol keys
+        to_h.deep_symbolize_keys == other.deep_symbolize_keys
+      when ToolResponse
+        # Direct comparison with another ToolResponse
+        contents == other.contents && is_error == other.is_error
+      else
+        super
+      end
+    end
+
+    # Implement eql? for hash key comparison
+    def eql?(other)
+      self == other
+    end
+
+    # Implement hash method for hash key usage
+    def hash
+      [ contents, is_error ].hash
+    end
+
+    # Pretty print for better debugging
+    def inspect
+      "#<#{self.class.name} content: #{contents.inspect}, isError: #{is_error}>"
+    end
+  end
+end

data/lib/action_mcp/tools_registry.rb

@@ -19,10 +19,9 @@ module ActionMCP
         tool_class = find(tool_name)
         tool = tool_class.new(arguments)
 
-        return error_response(tool.errors.full_messages) unless tool.valid?
-
-        process_result(tool.call)
+        tool.call.to_h
       rescue StandardError => e
+        # FIXME, we should maybe not return the error message to the user
         error_response([ "Tool execution failed: #{e.message}" ])
       end
 
@@ -32,24 +31,6 @@ module ActionMCP
 
       private
 
-      def process_result(result)
-        case result
-        when Hash
-          return result if result[:isError]
-          success_response([ result ])
-        when String
-          success_response([ Content::Text.new(result) ])
-        when Array
-          success_response(result)
-        else
-          success_response([ result ])
-        end
-      end
-
-      def success_response(content)
-        { content: content }
-      end
-
       def error_response(messages)
         {
           content: messages.map { |msg| Content::Text.new(msg) },

data/lib/action_mcp/version.rb

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

data/lib/generators/action_mcp/install/install_generator.rb

@@ -6,15 +6,15 @@ module ActionMcp
       source_root File.expand_path("templates", __dir__)
 
       def create_application_prompt_file
-        template "application_prompt.rb", File.join("app/mcp/prompts", "application_prompt.rb")
+        template "application_mcp_prompt.rb", File.join("app/mcp/prompts", "application_mcp_prompt.rb")
       end
 
       def create_application_tool_file
-        template "application_tool.rb", File.join("app/mcp/tools", "application_tool.rb")
+        template "application_mcp_tool.rb", File.join("app/mcp/tools", "application_mcp_tool.rb")
       end
 
       def create_mcp_resource_template_file
-        template "mcp_resource_template.rb", File.join("app/mcp/resource_templates", "mcp_resource_template.rb")
+        template "application_mcp_res_template.rb", File.join("app/mcp/resource_templates", "application_mcp_res_template.rb")
       end
     end
   end

data/lib/generators/action_mcp/install/templates/{application_prompt.rb → application_mcp_prompt.rb}

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-class ApplicationPrompt < ActionMCP::Prompt
+class ApplicationMCPPrompt < ActionMCP::Prompt
   abstract!
 end

data/lib/generators/action_mcp/install/templates/application_mcp_res_template.rb

@@ -0,0 +1,3 @@
+class ApplicationMCPResTemplate < ActionMCP::ResourceTemplate
+  abstract!
+end

data/lib/generators/action_mcp/install/templates/{application_tool.rb → application_mcp_tool.rb}

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-class ApplicationTool < ActionMCP::Tool
+class ApplicationMCPTool < ActionMCP::Tool
   abstract!
 end

data/lib/generators/action_mcp/prompt/templates/prompt.rb.erb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Template for generating new prompts.
-class <%= class_name %> < ApplicationPrompt
+class <%= class_name %> < ApplicationMCPPrompt
   # Set the prompt name.
   prompt_name "<%= prompt_name %>"
 

data/lib/generators/action_mcp/resource_template/resource_template_generator.rb

@@ -5,7 +5,7 @@ module ActionMcp
     class ResourceTemplateGenerator < Rails::Generators::NamedBase
       namespace "action_mcp:resource_template"
       source_root File.expand_path("templates", __dir__)
-      desc "Creates a ResourceTemplate (in app/mcp/resource_templates) that inherits from MCPResourceTemplate"
+      desc "Creates a ResourceTemplate (in app/mcp/resource_templates) that inherits from ApplicationMCPResTemplate"
 
       argument :name, type: :string, required: true, banner: "ResourceTemplateName"
 

data/lib/generators/action_mcp/resource_template/templates/resource_template.rb.erb

@@ -1,4 +1,4 @@
-class <%= class_name %> < MCPResourceTemplate
+class <%= class_name %> < ApplicationMCPResTemplate
   template_name "product"
   description "Access product information"
   uri_template "app://products/{product_id}"

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Template for generating new tools.
-class <%= class_name %> < ApplicationTool
+class <%= class_name %> < ApplicationMCPTool
   # Set the tool name.
   tool_name "<%= tool_name %>"
   description "Calculate the sum of two numbers"

data/lib/generators/action_mcp/tool/tool_generator.rb

@@ -5,7 +5,7 @@ module ActionMCP
     class ToolGenerator < Rails::Generators::Base
       namespace "action_mcp:tool"
       source_root File.expand_path("templates", __dir__)
-      desc "Creates a Tool (in app/mcp/tools) that inherits from ApplicationTool"
+      desc "Creates a Tool (in app/mcp/tools) that inherits from ApplicationMCPTool"
 
       # The generator takes one argument, e.g. "CalculateSum"
       argument :name, type: :string, required: true, banner: "ToolName"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: actionmcp
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 bindir: exe
 cert_chain: []
-date: 2025-03-15 00:00:00.000000000 Z
+date: 2025-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -112,9 +112,13 @@ files:
 - app/models/action_mcp/application_record.rb
 - app/models/action_mcp/session.rb
 - app/models/action_mcp/session/message.rb
+- app/models/action_mcp/session/resource.rb
+- app/models/action_mcp/session/subscription.rb
 - config/routes.rb
 - db/migrate/20250308122801_create_action_mcp_sessions.rb
 - db/migrate/20250314230152_add_is_ping_to_session_message.rb
+- db/migrate/20250316005021_create_action_mcp_session_subscriptions.rb
+- db/migrate/20250316005649_create_action_mcp_session_resources.rb
 - exe/actionmcp_cli
 - lib/action_mcp.rb
 - lib/action_mcp/capability.rb
@@ -136,6 +140,7 @@ files:
 - lib/action_mcp/json_rpc_handler.rb
 - lib/action_mcp/logging.rb
 - lib/action_mcp/prompt.rb
+- lib/action_mcp/prompt_response.rb
 - lib/action_mcp/prompts_registry.rb
 - lib/action_mcp/registry_base.rb
 - lib/action_mcp/renderable.rb
@@ -146,6 +151,7 @@ files:
 - lib/action_mcp/string_array.rb
 - lib/action_mcp/test_helper.rb
 - lib/action_mcp/tool.rb
+- lib/action_mcp/tool_response.rb
 - lib/action_mcp/tools_registry.rb
 - lib/action_mcp/transport.rb
 - lib/action_mcp/transport/capabilities.rb
@@ -160,9 +166,9 @@ files:
 - lib/action_mcp/version.rb
 - lib/actionmcp.rb
 - lib/generators/action_mcp/install/install_generator.rb
-- lib/generators/action_mcp/install/templates/application_prompt.rb
-- lib/generators/action_mcp/install/templates/application_tool.rb
-- lib/generators/action_mcp/install/templates/mcp_resource_template.rb
+- lib/generators/action_mcp/install/templates/application_mcp_prompt.rb
+- lib/generators/action_mcp/install/templates/application_mcp_res_template.rb
+- lib/generators/action_mcp/install/templates/application_mcp_tool.rb
 - lib/generators/action_mcp/prompt/prompt_generator.rb
 - lib/generators/action_mcp/prompt/templates/prompt.rb.erb
 - lib/generators/action_mcp/resource_template/resource_template_generator.rb

data/lib/generators/action_mcp/install/templates/mcp_resource_template.rb

@@ -1,3 +0,0 @@
-class MCPResourceTemplate < ActionMCP::ResourceTemplate
-  abstract!
-end