actionmcp 0.106.1 → 0.107.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c17941ba128e9db3431290d21c3eea28e284eef07e48077b5b72073c8bd108
-  data.tar.gz: 17d1ab49293f6b948b35862c92f00c52b1b44aad48c2a9dbc761009d3103d330
+  metadata.gz: c333cdfa82e92c5954fd45b97c45d3f569f7fb9a5711d85195d3e2f960a284a3
+  data.tar.gz: 6d9fa7a7aa0b9ee2bb7b1549a5a6ca288db448fe7e729c3e833147cc8e71742c
 SHA512:
-  metadata.gz: f6ec2bdf02b5758885178a43911f320931cb67613ca5d3526296e332e77b0627b968dd2137d3d6778431e281af3bfc83c99ca5dd3e6ee718ed0f8fa79a98168a
-  data.tar.gz: dafc2ff9f7cdc3d4ab4e1f8a26837f300e92fa74aefeee95ef2756ffc347aa29669fbdf6e1053bc14cc983bb225fe2e947d736a248b58afedbcc485d20fd8b58
+  metadata.gz: f4f60433d3d29a41ef1b884a54954954c08f08efa086b6b4cd239eb64527106297f8b4d33bf2dc97c328fe2292701ba2d235a1c2052bbba3127cc732f5b2b39c
+  data.tar.gz: ea0ed7c13e3b0cb92b09774a8aef1657550fc3d0e4244de24c502fe289164ffbb2b33e78ff55771f9a13df20194ae2c02cf1a8ebfba6c11baa4e93a4fabc8793

data/README.md

@@ -491,51 +491,6 @@ end
 
 For dynamic versioning, consider adding the `rails_app_version` gem.
 
-
-### PubSub Configuration
-
-ActionMCP uses a pub/sub system for real-time communication. You can choose between several adapters:
-
-1. **SolidMCP** - Database-backed pub/sub (no Redis required)
-2. **Simple** - In-memory pub/sub for development and testing
-3. **Redis** - Redis-backed pub/sub (if you prefer Redis)
-
-#### Migrating from ActionCable
-
-If you were previously using ActionCable with ActionMCP, you will need to migrate to the new PubSub system. Here's how:
-
-1. Remove the ActionCable dependency from your Gemfile (if you don't need it for other purposes)
-2. Install one of the PubSub adapters (SolidMCP recommended)
-3. Create a configuration file at `config/mcp.yml` (you can use the generator: `bin/rails g action_mcp:config`)
-4. Run your tests to ensure everything works correctly
-
-The new PubSub system maintains the same API as the previous ActionCable-based implementation, so your existing code should continue to work without changes.
-
-Configure your adapter in `config/mcp.yml`:
-
-```yaml
-development:
-  adapter: solid_mcp
-  polling_interval: 0.1.seconds
-  # Thread pool configuration (optional)
-  # min_threads: 5     # Minimum number of threads in the pool
-  # max_threads: 10    # Maximum number of threads in the pool
-  # max_queue: 100     # Maximum number of tasks that can be queued
-
-test:
-  adapter: test    # Uses the simple in-memory adapter
-
-production:
-  adapter: solid_mcp
-  polling_interval: 0.5.seconds
-  # Optional: connects_to: cable  # If using a separate database
-
-  # Thread pool configuration for high-traffic environments
-  min_threads: 10     # Minimum number of threads in the pool
-  max_threads: 20     # Maximum number of threads in the pool
-  max_queue: 500      # Maximum number of tasks that can be queued
-```
-
 ### Server Instructions
 
 Server instructions help LLMs understand **what your server is for** and **when to use it**. They describe the server's purpose and goal, not technical details like rate limits or authentication (tools are self-documented via their own descriptions).
@@ -565,46 +520,6 @@ production:
 
 Instructions are sent as a single string (joined by newlines) at the top level of the initialization response, helping LLMs understand your server's purpose.
 
-#### SolidMCP (Database-backed, Recommended)
-
-For SolidMCP, add it to your Gemfile:
-
-```ruby
-gem "solid_mcp"  # Database-backed adapter optimized for MCP
-```
-
-Then install it:
-
-```bash
-bundle 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`.
-
-#### Redis Adapter
-
-If you prefer Redis, add it to your Gemfile:
-
-```ruby
-gem "redis", "~> 5.0"
-```
-
-Then configure the Redis adapter in your `config/mcp.yml`:
-
-```yaml
-production:
-  adapter: redis
-  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
-  channel_prefix: your_app_production
-
-  # Thread pool configuration for high-traffic environments
-  min_threads: 10     # Minimum number of threads in the pool
-  max_threads: 20     # Maximum number of threads in the pool
-  max_queue: 500      # Maximum number of tasks that can be queued
-```
-
 ## Session Storage
 
 ActionMCP provides a pluggable session storage system that allows you to choose how sessions are persisted based on your environment and requirements.
@@ -747,7 +662,6 @@ You can configure the thread pool in your `config/mcp.yml`:
 
 ```yaml
 production:
-  adapter: solid_mcp
   # Thread pool configuration
   min_threads: 10    # Minimum number of threads to keep in the pool
   max_threads: 20    # Maximum number of threads the pool can grow to
@@ -772,7 +686,9 @@ This ensures all thread pools are properly terminated and tasks are completed.
 
 ## Engine and Mounting
 
-**ActionMCP** runs as a standalone Rack application. **Do not attempt to mount it in your application's `routes.rb`**—it is not designed to be mounted as an engine at a custom path. When you use `run ActionMCP::Engine` in your `mcp.ru`, the MCP endpoint is available at the root path (`/`) by default and can be configured via `config.action_mcp.base_path`.
+> **WARNING: Do NOT mount ActionMCP::Engine in your `routes.rb`.** ActionMCP is a standalone Rack application that runs on its own port via `mcp/config.ru`. Mounting it as a Rails engine route will not work correctly.
+
+When you use `run ActionMCP.server` in your `mcp/config.ru`, the MCP endpoint is available at the root path (`/`) by default and can be configured via `config.action_mcp.base_path`. Always use `ActionMCP.server` (not `ActionMCP::Engine` directly) — it initializes required subsystems.
 
 ### Installing ActionMCP
 
@@ -789,12 +705,14 @@ This will create:
 - `app/mcp/resource_templates/application_mcp_res_template.rb` - Base resource template class
 - `app/mcp/application_gateway.rb` - Gateway for authentication
 - `config/mcp.yml` - Configuration file with example settings for all environments
+- `mcp/config.ru` - Standalone Rack server configuration
+- `bin/mcp` - Server binstub (prefers Falcon, falls back to Puma)
 
 > **Note:** Authentication and authorization are not included. You are responsible for securing the endpoint.
 
 ## Authentication with Gateway
 
-ActionMCP provides a Gateway system similar to ActionCable's Connection for handling authentication. The Gateway allows you to authenticate users and make them available throughout your MCP components.
+ActionMCP provides a Gateway system for handling authentication. The Gateway allows you to authenticate users and make them available throughout your MCP components.
 
 ActionMCP uses a Gateway pattern with pluggable identifiers for authentication. You can implement custom authentication strategies using session-based auth, API keys, bearer tokens, or integrate with existing authentication systems like Warden, Devise, or external OAuth providers.
 
@@ -877,19 +795,43 @@ ActionMCP uses Rails' CurrentAttributes to store the authenticated context. The
 - `ActionMCP::Current.gateway` - The gateway instance
 - Any other attributes you define with `identified_by`
 
-### 1. Create `mcp.ru`
+### Persisting Context on Sessions
+
+Override `configure_session` in your gateway to persist auth context (user_id, tenant_id, roles) on the session for use in audit trails, background jobs, and cross-request scenarios:
+
+```ruby
+class ApplicationGateway < ActionMCP::Gateway
+  identified_by UserIdentifier
+
+  def configure_session(session)
+    session.session_data = { "user_id" => user.id, "tenant_id" => user.tenant_id }
+  end
+end
+```
+
+Tools access it via `session_data["user_id"]`. See [GATEWAY.md](GATEWAY.md) for details.
+
+### 1. Create `mcp/config.ru`
+
+The install generator (`rails generate action_mcp:install`) creates this automatically. If you need to create it manually:
 
 ```ruby
 # Load the full Rails environment to access models, DB, Redis, etc.
-require_relative "config/environment"
+require_relative "../config/environment"
+
+$stdout.sync = true
+
+# Eager load so all tools, prompts, and resources are registered.
+Rails.application.eager_load!
 
-# No need to set a custom endpoint path. The MCP endpoint is always served at root ("/")
-# when using ActionMCP::Engine directly.
-run ActionMCP::Engine
+# IMPORTANT: Use ActionMCP.server — it initializes required subsystems.
+# Do NOT use ActionMCP::Engine directly.
+run ActionMCP.server
 ```
 ### 2. Start the server
 ```bash
-bin/rails s -c mcp.ru -p 62770 -P tmp/pids/mcps0.pid
+bin/mcp                                          # Uses Falcon (recommended)
+bundle exec rails s -c mcp/config.ru -p 62770   # Uses Puma (fallback)
 ```
 
 ### Dealing with Middleware Conflicts
@@ -933,17 +875,17 @@ Run MCPS0 on its own TCP port (commonly `62770`):
 
 **With Falcon:**
 ```bash
-bundle exec falcon serve --bind http://0.0.0.0:62770 --config mcp.ru
+bundle exec falcon serve --bind http://0.0.0.0:62770 --config mcp/config.ru
 ```
 
 **With Puma:**
 ```bash
-bundle exec rails s -c mcp.ru -p 62770
+bundle exec rails s -c mcp/config.ru -p 62770
 ```
 
 **With Passenger:**
 ```bash
-passenger start --rackup mcp.ru --port 62770
+passenger start --rackup mcp/config.ru --port 62770
 ```
 
 Then, use your web server (Nginx, Apache, etc.) to reverse proxy requests to this port.
@@ -954,17 +896,17 @@ Alternatively, you can run MCPS0 on a Unix socket for improved performance and s
 
 **With Falcon:**
 ```bash
-bundle exec falcon serve --bind unix:/tmp/mcps0.sock mcp.ru
+bundle exec falcon serve --bind unix:/tmp/mcps0.sock mcp/config.ru
 ```
 
 **With Puma:**
 ```bash
-bundle exec puma -C config/puma.rb -b unix:///tmp/mcps0.sock -c mcp.ru
+bundle exec puma -C config/puma.rb -b unix:///tmp/mcps0.sock -c mcp/config.ru
 ```
 
 **With Passenger:**
 ```bash
-passenger start --rackup mcp.ru --socket /tmp/mcps0.sock
+passenger start --rackup mcp/config.ru --socket /tmp/mcps0.sock
 ```
 
 And configure your web server to proxy to the socket:
@@ -994,7 +936,7 @@ location ~* ^/mcp {
   root /path/to/current/public;
   passenger_app_root /path/to/current;
   passenger_enabled on;
-  passenger_startup_file mcp.ru;
+  passenger_startup_file mcp/config.ru;
   passenger_app_group_name mcp;
 }
 ```
@@ -1018,7 +960,7 @@ bin/rails action_mcp:install:migrations  # to copy the migrations
 bin/rails generate action_mcp:install
 ```
 
-This will create the base application classes, configuration file, and authentication gateway in your app directory.
+This will create the base application classes, configuration file, authentication gateway, `mcp/config.ru` rackup file, and `bin/mcp` binstub in your app directory.
 
 ### Generate a New Prompt
 
@@ -1071,7 +1013,7 @@ You can use the MCP Inspector to test your server implementation:
 
 ```bash
 # Start your MCP server
-bundle exec rails s -c mcp.ru -p 62770
+bundle exec rails s -c mcp/config.ru -p 62770
 
 # In another terminal, run the inspector
 npx @modelcontextprotocol/inspector --url http://localhost:62770

data/app/controllers/action_mcp/application_controller.rb

@@ -320,6 +320,7 @@ module ActionMCP
       begin
         gateway = gateway_class.new(request)
         gateway.call
+        gateway.configure_session(mcp_session)
       rescue ActionMCP::UnauthorizedError => e
         render_unauthorized(e.message)
       rescue StandardError => e

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

@@ -5,17 +5,17 @@
 # database_dialect = "SQLite"
 #
 # columns = [
-#   { name = "id", type = "integer", primary_key = true, nullable = false },
-#   { name = "session_id", type = "string", nullable = false },
-#   { name = "direction", type = "string", nullable = false, default = "client" },
-#   { name = "message_type", type = "string", nullable = false },
-#   { name = "jsonrpc_id", type = "string", nullable = true },
-#   { name = "message_json", type = "json", nullable = true },
-#   { name = "is_ping", type = "boolean", nullable = false, default = "0" },
-#   { name = "request_acknowledged", type = "boolean", nullable = false, default = "0" },
-#   { name = "request_cancelled", type = "boolean", nullable = false, default = "0" },
-#   { name = "created_at", type = "datetime", nullable = false },
-#   { name = "updated_at", type = "datetime", nullable = false }
+#   { name = "id", type = "integer", pk = true, null = false },
+#   { name = "created_at", type = "datetime", null = false },
+#   { name = "direction", type = "string", null = false, default = "client" },
+#   { name = "is_ping", type = "boolean", null = false },
+#   { name = "jsonrpc_id", type = "string" },
+#   { name = "message_json", type = "json" },
+#   { name = "message_type", type = "string", null = false },
+#   { name = "request_acknowledged", type = "boolean", null = false },
+#   { name = "request_cancelled", type = "boolean", null = false },
+#   { name = "session_id", type = "string", null = false },
+#   { name = "updated_at", type = "datetime", null = false }
 # ]
 #
 # indexes = [
@@ -26,14 +26,10 @@
 #   { column = "session_id", references_table = "action_mcp_sessions", references_column = "id", on_delete = "cascade", on_update = "cascade" }
 # ]
 #
-# == Notes
-# - Column 'message_json' should probably have NOT NULL constraint
-# - String column 'session_id' has no length limit - consider adding one
-# - String column 'direction' has no length limit - consider adding one
-# - String column 'message_type' has no length limit - consider adding one
-# - String column 'jsonrpc_id' has no length limit - consider adding one
-# - Column 'message_type' is commonly used in queries - consider adding an index
-# - Column 'is_ping' uses non-conventional prefix - consider removing 'is_' or 'has_'
+# [callbacks]
+# after_create = [{ method = "acknowledge_request", if = ["proc"] }]
+#
+# notes = ["message_json:NOT_NULL", "direction:LIMIT", "jsonrpc_id:LIMIT", "message_type:LIMIT", "session_id:LIMIT", "message_type:INDEX"]
 # <rails-lens:schema:end>
 module ActionMCP
   class Session
@@ -49,15 +45,12 @@ module ActionMCP
                  inverse_of: :messages,
                  counter_cache: true
 
-      delegate :adapter,
-               :role,
-               :session_key,
+      delegate :role,
                to: :session
 
       # Virtual attribute for data
       attr_reader :data
 
-      after_create_commit :broadcast_message, if: :outgoing_message?
       # Set is_ping on responses if the original request was a ping
       after_create :acknowledge_request, if: -> { %w[response error].include?(message_type) }
 
@@ -117,16 +110,6 @@ module ActionMCP
 
       private
 
-      def outgoing_message?
-        direction != role
-      end
-
-      def broadcast_message
-        return unless adapter.present?
-
-        adapter.broadcast(session_key, data.to_json)
-      end
-
       def process_json_content(content)
         if content.is_a?(JSON_RPC::Notification) || content.is_a?(JSON_RPC::Request) || content.is_a?(JSON_RPC::Response)
           content = content.to_h.with_indifferent_access

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

@@ -5,12 +5,12 @@
 # database_dialect = "SQLite"
 #
 # columns = [
-#   { name = "id", type = "integer", primary_key = true, nullable = false },
-#   { name = "session_id", type = "string", nullable = false },
-#   { name = "uri", type = "string", nullable = false },
-#   { name = "last_notification_at", type = "datetime", nullable = true },
-#   { name = "created_at", type = "datetime", nullable = false },
-#   { name = "updated_at", type = "datetime", nullable = false }
+#   { name = "id", type = "integer", pk = true, null = false },
+#   { name = "created_at", type = "datetime", null = false },
+#   { name = "last_notification_at", type = "datetime" },
+#   { name = "session_id", type = "string", null = false },
+#   { name = "updated_at", type = "datetime", null = false },
+#   { name = "uri", type = "string", null = false }
 # ]
 #
 # indexes = [
@@ -21,10 +21,7 @@
 #   { column = "session_id", references_table = "action_mcp_sessions", references_column = "id", on_delete = "cascade" }
 # ]
 #
-# == Notes
-# - Consider adding counter cache for 'session'
-# - String column 'session_id' has no length limit - consider adding one
-# - String column 'uri' has no length limit - consider adding one
+# notes = ["session:COUNTER_CACHE", "session_id:LIMIT", "uri:LIMIT"]
 # <rails-lens:schema:end>
 module ActionMCP
   class Session

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

@@ -1,5 +1,44 @@
 # frozen_string_literal: true
 
+# <rails-lens:schema:begin>
+# table = "action_mcp_session_tasks"
+# database_dialect = "SQLite"
+#
+# columns = [
+#   { name = "id", type = "string", pk = true, null = false },
+#   { name = "created_at", type = "datetime", null = false },
+#   { name = "last_updated_at", type = "datetime", null = false },
+#   { name = "poll_interval", type = "integer" },
+#   { name = "progress_message", type = "string" },
+#   { name = "progress_percent", type = "integer" },
+#   { name = "request_method", type = "string" },
+#   { name = "request_name", type = "string" },
+#   { name = "request_params", type = "json" },
+#   { name = "result_payload", type = "json" },
+#   { name = "session_id", type = "string", null = false },
+#   { name = "status", type = "string", null = false, default = "working" },
+#   { name = "status_message", type = "string" },
+#   { name = "ttl", type = "integer" },
+#   { name = "updated_at", type = "datetime", null = false }
+# ]
+#
+# indexes = [
+#   { name = "index_action_mcp_session_tasks_on_status", columns = ["status"] },
+#   { name = "index_action_mcp_session_tasks_on_session_id", columns = ["session_id"] },
+#   { name = "index_action_mcp_session_tasks_on_session_id_and_status", columns = ["session_id", "status"] },
+#   { name = "index_action_mcp_session_tasks_on_created_at", columns = ["created_at"] }
+# ]
+#
+# foreign_keys = [
+#   { column = "session_id", references_table = "action_mcp_sessions", references_column = "id", on_delete = "cascade", on_update = "cascade" }
+# ]
+#
+# [callbacks]
+# before_validation = [{ method = "set_last_updated_at" }]
+# around_validation = [{ method = "machine" }]
+#
+# notes = ["index_action_mcp_session_tasks_on_session_id:REDUND_IDX", "session:COUNTER_CACHE", "poll_interval:NOT_NULL", "progress_message:NOT_NULL", "progress_percent:NOT_NULL", "request_method:NOT_NULL", "request_name:NOT_NULL", "request_params:NOT_NULL", "result_payload:NOT_NULL", "status_message:NOT_NULL", "ttl:NOT_NULL", "status_message:DEFAULT", "id:LIMIT", "progress_message:LIMIT", "request_method:LIMIT", "request_name:LIMIT", "session_id:LIMIT", "status:LIMIT", "status_message:LIMIT", "status_message:INDEX"]
+# <rails-lens:schema:end>
 require "state_machines-activerecord"
 
 module ActionMCP

data/app/models/action_mcp/session.rb

@@ -5,44 +5,31 @@
 # database_dialect = "SQLite"
 #
 # columns = [
-#   { name = "id", type = "string", primary_key = true, nullable = false },
-#   { name = "role", type = "string", nullable = false, default = "server" },
-#   { name = "status", type = "string", nullable = false, default = "pre_initialize" },
-#   { name = "ended_at", type = "datetime", nullable = true },
-#   { name = "protocol_version", type = "string", nullable = true },
-#   { name = "server_capabilities", type = "json", nullable = true },
-#   { name = "client_capabilities", type = "json", nullable = true },
-#   { name = "server_info", type = "json", nullable = true },
-#   { name = "client_info", type = "json", nullable = true },
-#   { name = "initialized", type = "boolean", nullable = false, default = "0" },
-#   { name = "messages_count", type = "integer", nullable = false, default = "0" },
-#   { name = "sse_event_counter", type = "integer", nullable = false, default = "0" },
-#   { name = "tool_registry", type = "json", nullable = true, default = "[]" },
-#   { name = "prompt_registry", type = "json", nullable = true, default = "[]" },
-#   { name = "resource_registry", type = "json", nullable = true, default = "[]" },
-#   { name = "created_at", type = "datetime", nullable = false },
-#   { name = "updated_at", type = "datetime", nullable = false },
-#   { name = "consents", type = "json", nullable = false, default = "{}" }
+#   { name = "id", type = "string", pk = true, null = false },
+#   { name = "client_capabilities", type = "json" },
+#   { name = "client_info", type = "json" },
+#   { name = "consents", type = "json", null = false, default = "{}" },
+#   { name = "session_data", type = "json", null = false, default = "{}" },
+#   { name = "created_at", type = "datetime", null = false },
+#   { name = "ended_at", type = "datetime" },
+#   { name = "initialized", type = "boolean", null = false },
+#   { name = "messages_count", type = "integer", null = false, default = 0 },
+#   { name = "prompt_registry", type = "json", default = "[]" },
+#   { name = "protocol_version", type = "string" },
+#   { name = "resource_registry", type = "json", default = "[]" },
+#   { name = "role", type = "string", null = false, default = "server" },
+#   { name = "server_capabilities", type = "json" },
+#   { name = "server_info", type = "json" },
+#   { name = "status", type = "string", null = false, default = "pre_initialize" },
+#   { name = "tool_registry", type = "json", default = "[]" },
+#   { name = "updated_at", type = "datetime", null = false }
 # ]
 #
-# == Notes
-# - Association 'messages' has N+1 query risk. Consider using includes/preload
-# - Association 'subscriptions' has N+1 query risk. Consider using includes/preload
-# - Association 'resources' has N+1 query risk. Consider using includes/preload
-# - Association 'sse_events' has N+1 query risk. Consider using includes/preload
-# - Column 'protocol_version' should probably have NOT NULL constraint
-# - Column 'server_capabilities' should probably have NOT NULL constraint
-# - Column 'client_capabilities' should probably have NOT NULL constraint
-# - Column 'server_info' should probably have NOT NULL constraint
-# - Column 'client_info' should probably have NOT NULL constraint
-# - Column 'tool_registry' should probably have NOT NULL constraint
-# - Column 'prompt_registry' should probably have NOT NULL constraint
-# - Column 'resource_registry' should probably have NOT NULL constraint
-# - String column 'id' has no length limit - consider adding one
-# - String column 'role' has no length limit - consider adding one
-# - String column 'status' has no length limit - consider adding one
-# - String column 'protocol_version' has no length limit - consider adding one
-# - Column 'status' is commonly used in queries - consider adding an index
+# [callbacks]
+# before_create = [{ method = "initialize_registries" }, { method = "set_server_info", if = ["proc"] }, { method = "set_server_capabilities", if = ["proc"] }]
+# after_initialize = [{ method = "proc" }]
+#
+# notes = ["messages:N_PLUS_ONE", "subscriptions:N_PLUS_ONE", "tasks:N_PLUS_ONE", "client_capabilities:NOT_NULL", "client_info:NOT_NULL", "prompt_registry:NOT_NULL", "protocol_version:NOT_NULL", "resource_registry:NOT_NULL", "server_capabilities:NOT_NULL", "server_info:NOT_NULL", "tool_registry:NOT_NULL", "id:LIMIT", "protocol_version:LIMIT", "role:LIMIT", "status:LIMIT", "status:INDEX"]
 # <rails-lens:schema:end>
 module ActionMCP
   ##
@@ -67,12 +54,6 @@ module ActionMCP
              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
-
     has_many :tasks,
              class_name: "ActionMCP::Session::Task",
              foreign_key: "session_id",
@@ -93,8 +74,6 @@ module ActionMCP
     validates :protocol_version, inclusion: { in: ActionMCP::SUPPORTED_VERSIONS }, allow_nil: true
 
     def close!
-      dummy_callback = ->(*) { } # this callback seem broken
-      adapter.unsubscribe(session_key, dummy_callback)
       if messages_count.zero?
         # if there are no messages, we can delete the session immediately
         destroy
@@ -119,14 +98,6 @@ module ActionMCP
       messages.create!(data: data, direction: role)
     end
 
-    def session_key
-      "action_mcp:session:#{id}"
-    end
-
-    def adapter
-      @adapter ||= ActionMCP::Server.server.pubsub
-    end
-
     def set_protocol_version(version)
       update(protocol_version: version)
     end
@@ -321,7 +292,6 @@ module ActionMCP
       resource_registry == [ "*" ]
     end
 
-
     # Consent management methods as per MCP specification
     # These methods manage user consents for tools and resources
 

data/db/migrate/20250512154359_consolidated_migration.rb

@@ -17,7 +17,6 @@ class ConsolidatedMigration < ActiveRecord::Migration[8.0]
         t.json :client_info, comment: 'The information about the client'
         t.boolean :initialized, null: false, default: false
         t.integer :messages_count, null: false, default: 0
-        t.integer :sse_event_counter, default: 0, null: false
         t.json :tool_registry, default: []
         t.json :prompt_registry, default: []
         t.json :resource_registry, default: []
@@ -57,46 +56,10 @@ class ConsolidatedMigration < ActiveRecord::Migration[8.0]
       end
     end
 
-    # Create session resources table
-    unless table_exists?(:action_mcp_session_resources)
-      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
-    end
-
-    # Create SSE events table
-    unless table_exists?(:action_mcp_sse_events)
-      create_table :action_mcp_sse_events do |t|
-        t.references :session, null: false, foreign_key: { to_table: :action_mcp_sessions }, index: true, type: :string
-        t.integer :event_id, null: false
-        t.text :data, null: false
-        t.timestamps
-
-        # Index for efficiently retrieving events after a given ID for a specific session
-        t.index %i[session_id event_id], unique: true
-        t.index :created_at # For cleanup of old events
-      end
-    end
-
     # Add missing columns to existing tables if they exist
 
     # For action_mcp_sessions
     if table_exists?(:action_mcp_sessions)
-      unless column_exists?(:action_mcp_sessions, :sse_event_counter)
-        add_column :action_mcp_sessions, :sse_event_counter, :integer, default: 0, null: false
-      end
-
       unless column_exists?(:action_mcp_sessions, :tool_registry)
         add_column :action_mcp_sessions, :tool_registry, :json, default: []
       end

data/db/migrate/20260303000001_add_session_data_to_action_mcp_sessions.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddSessionDataToActionMCPSessions < ActiveRecord::Migration[8.1]
+  def change
+    return if column_exists?(:action_mcp_sessions, :session_data)
+
+    add_column :action_mcp_sessions, :session_data, :json, default: {}, null: false
+  end
+end

data/db/migrate/20260304000001_remove_session_resources.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class RemoveSessionResources < ActiveRecord::Migration[8.1]
+  def up
+    drop_table :action_mcp_session_resources, if_exists: true
+  end
+
+  def down
+    return if table_exists?(:action_mcp_session_resources)
+
+    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
+  end
+end

data/lib/action_mcp/capability.rb

@@ -30,6 +30,8 @@ module ActionMCP
       execution_context[:session]
     end
 
+    delegate :session_data, to: :session, allow_nil: true
+
     # use _capability_name or default_capability_name
     def self.capability_name
       _capability_name || default_capability_name