actionmcp 0.111.1 → 0.200.0

data/lib/action_mcp/apps/view_manifest.rb

@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+module ActionMCP
+  module Apps
+    # Namespace for ResourceTemplate classes generated from a compiled-views
+    # manifest.
+    module Views; end
+
+    # Loads `.action_mcp/views/manifest.json` (emitted by
+    # @action-mcp/vite-plugin) and registers one ResourceTemplate per compiled
+    # view, serving the bundle inlined into an HTML shell as a `ui://` resource.
+    class ViewManifest
+      SCHEMA_VERSION = 1
+      MANIFEST_FILENAME = "manifest.json"
+
+      class Error < StandardError; end
+
+      class << self
+        # Registers templates for every view in the manifest. Idempotent:
+        # previously generated view classes are evicted first, so rebuilt
+        # manifests (new hashes) load cleanly on app reload.
+        #
+        # @return [Array<Class>] the generated ResourceTemplate subclasses
+        def load!(dir = nil)
+          dir = resolve_dir(dir)
+          manifest_path = File.join(dir, MANIFEST_FILENAME)
+          unless File.exist?(manifest_path)
+            evict_generated_templates!
+            return []
+          end
+
+          data = parse_manifest(manifest_path)
+          evict_generated_templates!
+
+          aliases = {}
+          classes = data.fetch("views", {}).map do |name, entry|
+            klass, logical_uri, resource_uri = register_view(dir, name, entry)
+            if aliases.key?(logical_uri)
+              raise Error, "Duplicate logicalUri #{logical_uri.inspect} in views manifest"
+            end
+
+            aliases[logical_uri] = resource_uri
+            klass
+          end
+          @resource_uri_aliases = aliases.freeze
+          classes
+        rescue StandardError
+          evict_generated_templates!
+          raise
+        end
+
+        # Resolves the stable URI declared by a tool to the content-addressed
+        # resource URI currently registered from the compiled views manifest.
+        def resolve_resource_uri(uri)
+          (@resource_uri_aliases || {}).fetch(uri, uri)
+        end
+
+        private
+
+        def resolve_dir(dir)
+          path = (dir || ActionMCP.configuration.mcp_apps_views_path).to_s
+          return path if File.absolute_path?(path)
+
+          defined?(Rails) && Rails.root ? Rails.root.join(path).to_s : File.expand_path(path)
+        end
+
+        def parse_manifest(path)
+          data = JSON.parse(File.read(path))
+          version = data["schemaVersion"]
+          unless version == SCHEMA_VERSION
+            raise Error, "Unsupported views manifest schemaVersion #{version.inspect} at #{path} " \
+                         "(expected #{SCHEMA_VERSION}; rebuild with a matching @action-mcp/vite-plugin)"
+          end
+          data
+        rescue JSON::ParserError => e
+          raise Error, "Invalid views manifest at #{path}: #{e.message}"
+        end
+
+        def evict_generated_templates!
+          generated = Views.constants(false).filter_map do |const|
+            Views.const_get(const, false)
+          end
+
+          generated.concat(ResourceTemplate.registered_templates.select { |klass| generated_template?(klass) })
+          generated.concat(ResourceTemplatesRegistry.items.values.select { |klass| generated_template?(klass) })
+          generated.uniq!
+
+          ResourceTemplate.registered_templates.delete_if do |klass|
+            generated.include?(klass) || generated_template?(klass)
+          end
+          ResourceTemplatesRegistry.items.delete_if do |_name, klass|
+            generated.include?(klass) || generated_template?(klass)
+          end
+
+          Views.constants(false).each do |const|
+            Views.send(:remove_const, const)
+          end
+
+          @resource_uri_aliases = {}.freeze
+        end
+
+        def generated_template?(klass)
+          klass.is_a?(Class) && klass.name&.start_with?("#{Views.name}::")
+        end
+
+        def register_view(dir, name, entry)
+          unless entry.is_a?(Hash)
+            raise Error, "Views manifest entry for #{name.inspect} must be an object"
+          end
+
+          bundle_path = File.join(dir, entry.fetch("file"))
+          unless File.exist?(bundle_path)
+            raise Error, "Views manifest references missing bundle #{entry['file'].inspect} for view #{name.inspect}. " \
+                         "Rebuild with action-mcp-build-views."
+          end
+
+          uri = entry.fetch("uri")
+          logical_uri = entry.fetch("logicalUri", "ui://views/#{name}")
+          validate_view_uri!(uri, field: "uri", view_name: name)
+          validate_view_uri!(logical_uri, field: "logicalUri", view_name: name)
+          ui_meta = entry["ui"]
+
+          klass = Class.new(ResourceTemplate)
+          const_name = "#{name.underscore.camelize}View"
+          Views.const_set(const_name, klass)
+          # The inheritance hook sees the class before it has a constant name
+          # and may cache/register the empty capability name. Reset that state
+          # now that the generated class has its final identity.
+          klass.remove_instance_variable(:@capability_name) if klass.instance_variable_defined?(:@capability_name)
+
+          klass.class_eval do
+            description "Compiled MCP Apps view: #{name}"
+            uri_template uri
+            mime_type :mcp_app
+            ui(**ui_meta.deep_symbolize_keys) if ui_meta.is_a?(Hash) && ui_meta.any?
+
+            define_method(:resolve) do
+              render_ui(text: ViewManifest.send(:html_shell, name, bundle_path))
+            end
+          end
+
+          ResourceTemplatesRegistry.items.delete_if { |_key, registered| registered.equal?(klass) }
+          ResourceTemplatesRegistry.register(klass)
+
+          [ klass, logical_uri, uri ]
+        end
+
+        def validate_view_uri!(uri, field:, view_name:)
+          return if uri.is_a?(String) && Apps::URI_SCHEME.match?(uri)
+
+          raise Error, "Views manifest #{field} for #{view_name.inspect} must be a ui:// URI, got: #{uri.inspect}"
+        end
+
+        def html_shell(name, bundle_path)
+          js = File.read(bundle_path).gsub("</script", "<\\/script")
+          <<~HTML
+            <!doctype html>
+            <html>
+              <head><meta charset="utf-8"><title>#{ERB::Util.html_escape(name)}</title></head>
+              <body>
+                <div id="root"></div>
+                <script type="module">#{js}</script>
+              </body>
+            </html>
+          HTML
+        end
+      end
+    end
+  end
+end

data/lib/action_mcp/apps.rb

@@ -11,7 +11,8 @@ module ActionMCP
     MIME_TYPE = MimeTypes::APP_HTML
     EXTENSION_SETTINGS = { mimeTypes: [ MIME_TYPE ] }.freeze
 
-    # `_meta.ui.csp` directive keys per ext-apps spec.
+    # `_meta.ui` fields and nested CSP directive keys per ext-apps spec.
+    UI_META_KEYS = %i[csp permissions domain prefersBorder].freeze
     CSP_KEYS = %i[connectDomains resourceDomains frameDomains baseUriDomains].freeze
     PERMISSION_KEYS = %i[camera microphone geolocation clipboardWrite].freeze
 
@@ -19,8 +20,22 @@ module ActionMCP
     CONNECT_ORIGIN_PATTERN = %r{\A(?:https?|wss?)://[^\s"'<>]+\z}
     RESOURCE_ORIGIN_PATTERN = %r{\Ahttps?://[^\s"'<>]+\z}
 
+    # Vendored browser bridge: the official self-contained ESM bundle from
+    # @modelcontextprotocol/ext-apps (app-with-deps export). Refresh with
+    # bin/update-apps-bridge.
+    BRIDGE_PACKAGE = "@modelcontextprotocol/ext-apps"
+    BRIDGE_VERSION = "1.7.4"
+    BRIDGE_PATH = File.expand_path("apps/javascript/ext_apps.js", __dir__)
+
     module_function
 
+    # Raw ESM source of the vendored ext-apps browser bundle, with `</script>`
+    # sequences neutralized so it can be inlined into a <script> element.
+    # (`<\/` and `/` are identical inside JS strings and regexes.)
+    def bridge_source
+      @bridge_source ||= File.read(BRIDGE_PATH).gsub("</script", "<\\/script").freeze
+    end
+
     def extension_settings
       EXTENSION_SETTINGS.deep_dup
     end
@@ -31,7 +46,7 @@ module ActionMCP
       return false unless settings.is_a?(Hash)
 
       mime_types = settings["mimeTypes"] || settings[:mimeTypes]
-      Array(mime_types).include?(MIME_TYPE)
+      mime_types.is_a?(Array) && mime_types.include?(MIME_TYPE)
     end
   end
 end

data/lib/action_mcp/configuration.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative "gateway"
-require "active_support/core_ext/integer/time"
 
 module ActionMCP
   # Configuration class to hold settings for the ActionMCP server.
@@ -45,13 +44,10 @@ module ActionMCP
                   :tasks_enabled,
                   :tasks_list_enabled,
                   :tasks_cancel_enabled,
-                  :tasks_result_strategy,
-                  :tasks_result_timeout,
                   :tasks_result_poll_interval,
                   # --- MCP Apps Extension Options ---
                   :mcp_apps_enabled,
-                  # --- Schema Validation Options ---
-                  :validate_structured_content,
+                  :mcp_apps_views_path,
                   # --- Allowed identity keys for gateway ---
                   :allowed_identity_keys,
                   # --- JSON-RPC Path ---
@@ -71,26 +67,24 @@ module ActionMCP
       # Authentication defaults - empty means all configured identifiers will be tried
       @authentication_methods = []
 
-      @protocol_version = "2025-06-18"  # Default to stable version for backwards compatibility
+      @protocol_version = "2025-11-25"
 
       # Tasks defaults (MCP 2025-11-25)
       @tasks_enabled = false
       @tasks_list_enabled = true
       @tasks_cancel_enabled = true
-      @tasks_result_strategy = :blocking_http
-      @tasks_result_timeout = 30.seconds
       @tasks_result_poll_interval = 0.25
 
       # MCP Apps extension defaults to explicit opt-in.
       @mcp_apps_enabled = false
+      # Directory holding compiled view bundles + manifest.json, relative to
+      # Rails.root unless absolute.
+      @mcp_apps_views_path = ".action_mcp/views"
 
       # Pagination - nil means off. Set a number to enable with that page size.
       # Most MCP clients (including Claude Code) don't follow nextCursor yet.
       @pagination_page_size = nil
 
-      # Schema validation - disabled by default for backward compatibility
-      @validate_structured_content = false
-
       # Server instructions - empty by default
       @server_instructions = []
 
@@ -110,8 +104,9 @@ module ActionMCP
       # Path for JSON-RPC endpoint
       @base_path = "/"
 
-      # Allowed origins for DNS rebinding protection (nil = derive from request.host)
-      @allowed_origins = nil
+      # Browser origins allowed to reach a local server. Remote deployments must
+      # explicitly add their trusted origin hosts.
+      @allowed_origins = %w[localhost 127.0.0.1 ::1].freeze
     end
 
     def name
@@ -163,19 +158,6 @@ module ActionMCP
       end
     end
 
-    def tasks_result_strategy=(value)
-      strategy = value.to_sym
-      unless %i[blocking_http polling_only].include?(strategy)
-        raise ArgumentError, "tasks_result_strategy must be :blocking_http or :polling_only, got: #{value.inspect}"
-      end
-
-      @tasks_result_strategy = strategy
-    end
-
-    def tasks_result_timeout=(value)
-      @tasks_result_timeout = normalize_positive_duration(value, "tasks_result_timeout")
-    end
-
     def tasks_result_poll_interval=(value)
       @tasks_result_poll_interval = normalize_positive_duration(value, "tasks_result_poll_interval")
     end
@@ -184,12 +166,14 @@ module ActionMCP
       # Resolve gateway class lazily to account for Zeitwerk autoloading
       # This allows ApplicationGateway to be loaded from app/mcp even if the
       # configuration is initialized before Zeitwerk runs
-      if @gateway_class_name
+      if instance_variable_defined?(:@gateway_class)
+        @gateway_class
+      elsif @gateway_class_name
         @gateway_class_name.constantize
       elsif defined?(::ApplicationGateway)
         ::ApplicationGateway
       else
-        ActionMCP::Gateway
+        nil
       end
     end
 
@@ -305,6 +289,7 @@ module ActionMCP
       capabilities[:prompts] = { listChanged: @list_changed } if profile && profile[:prompts]&.any?
 
       capabilities[:logging] = {} if @logging_enabled
+      capabilities[:completions] = {}
 
       # If profile includes resources, advertise resources capability
       if profile && profile[:resources]&.any?
@@ -442,13 +427,12 @@ module ActionMCP
         self.pagination_page_size = config["pagination_page_size"]
       end
 
-      self.tasks_result_strategy = config["tasks_result_strategy"] if config.key?("tasks_result_strategy")
-      self.tasks_result_timeout = config["tasks_result_timeout"] if config.key?("tasks_result_timeout")
       if config.key?("tasks_result_poll_interval")
         self.tasks_result_poll_interval = config["tasks_result_poll_interval"]
       end
 
       @mcp_apps_enabled = boolean_config_value(config["mcp_apps_enabled"]) if config.key?("mcp_apps_enabled")
+      @mcp_apps_views_path = config["mcp_apps_views_path"].to_s if config.key?("mcp_apps_views_path")
 
       # Extract allowed origins for DNS rebinding protection
       if config["allowed_origins"]

data/lib/action_mcp/content/audio.rb

@@ -17,13 +17,16 @@ module ActionMCP
         super("audio", annotations: annotations)
         @data = data
         @mime_type = mime_type
+        to_h
       end
 
       # Returns a hash representation of the audio content.
       #
       # @return [Hash] The hash representation of the audio content.
       def to_h
-        super.merge(data: @data, mimeType: @mime_type)
+        super.merge(data: @data, mimeType: @mime_type).tap do |result|
+          Validation.validate_content_block!(result)
+        end
       end
     end
   end

data/lib/action_mcp/content/base.rb

@@ -12,7 +12,8 @@ module ActionMCP
       # @param annotations [Hash, nil] Optional annotations for the content.
       def initialize(type, annotations: nil)
         @type = type
-        @annotations = annotations
+        @annotations = annotations.nil? ? nil : Validation.copy_object!(annotations, "annotations")
+        Validation.validate_annotations!(@annotations)
       end
 
       # Returns a hash representation of the base content.
@@ -21,6 +22,7 @@ module ActionMCP
       def to_h
         h = { type: @type }
         h[:annotations] = @annotations if @annotations
+        Validation.validate_annotations!(@annotations)
         h
       end
     end

data/lib/action_mcp/content/image.rb

@@ -17,13 +17,16 @@ module ActionMCP
         super("image", annotations: annotations)
         @data = data
         @mime_type = mime_type
+        to_h
       end
 
       # Returns a hash representation of the image content.
       #
       # @return [Hash] The hash representation of the image content.
       def to_h
-        super.merge(data: @data, mimeType: @mime_type)
+        super.merge(data: @data, mimeType: @mime_type).tap do |result|
+          Validation.validate_content_block!(result)
+        end
       end
     end
   end

data/lib/action_mcp/content/resource.rb

@@ -21,22 +21,23 @@ module ActionMCP
       # @param annotations [Hash, nil] Optional annotations for the resource.
       # @param meta [Hash, #to_hash, #to_h, nil] Optional extension metadata. Emitted on the wire as `_meta`.
       def initialize(uri, mime_type = "text/plain", text: nil, blob: nil, annotations: nil, meta: nil)
+        raise ArgumentError, "uri must be a non-empty string" unless uri.is_a?(String) && uri.present?
+        unless mime_type.nil? || (mime_type.is_a?(String) && mime_type.present?)
+          raise ArgumentError, "mime_type must be a non-empty string or nil"
+        end
+        unless [ !text.nil?, !blob.nil? ].one?
+          raise ArgumentError, "embedded resources require exactly one of text or blob"
+        end
+        raise ArgumentError, "text must be a string" if !text.nil? && !text.is_a?(String)
+        raise ArgumentError, "blob must be a base64 string" if !blob.nil? && !blob.is_a?(String)
+
         super("resource", annotations: annotations)
         @uri = uri
         @mime_type = mime_type
         @text = text
         @blob = blob
-        @annotations = annotations
-        @meta =
-          if meta.nil?
-            nil
-          elsif meta.respond_to?(:to_hash)
-            meta.to_hash
-          elsif meta.respond_to?(:to_h)
-            meta.to_h
-          else
-            raise ArgumentError, "meta must respond to :to_hash or :to_h, got: #{meta.class}"
-          end
+        @meta = meta.nil? ? nil : Validation.copy_object!(meta, "meta")
+        to_h
       end
 
       # Returns a hash representation of the resource content.
@@ -46,13 +47,13 @@ module ActionMCP
       #
       # @return [Hash] The hash representation of the resource content.
       def to_h
-        inner = { uri: @uri, mimeType: @mime_type }
+        inner = { uri: @uri }
+        inner[:mimeType] = @mime_type if @mime_type
         inner[:text] = @text if @text
         inner[:blob] = @blob if @blob
-        inner[:annotations] = @annotations if @annotations
         inner[:_meta] = @meta if @meta && !@meta.empty?
 
-        { type: @type, resource: inner }
+        super.merge(resource: inner).tap { |result| Validation.validate_content_block!(result) }
       end
     end
   end

data/lib/action_mcp/content/resource_link.rb

@@ -7,7 +7,7 @@ module ActionMCP
     # Note: resource links returned by tools are not guaranteed to appear in resources/list requests.
     class ResourceLink < Base
       # @return [String] The URI of the resource.
-      # @return [String, nil] The name of the resource (optional).
+      # @return [String] The name of the resource.
       # @return [String, nil] The description of the resource (optional).
       # @return [String, nil] The MIME type of the resource (optional).
       attr_reader :uri, :name, :description, :mime_type
@@ -15,26 +15,36 @@ module ActionMCP
       # Initializes a new ResourceLink content.
       #
       # @param uri [String] The URI of the resource.
-      # @param name [String, nil] The name of the resource (optional).
+      # @param name [String] The name of the resource.
       # @param description [String, nil] The description of the resource (optional).
       # @param mime_type [String, nil] The MIME type of the resource (optional).
       # @param annotations [Hash, nil] Optional annotations for the resource link.
-      def initialize(uri, name: nil, description: nil, mime_type: nil, annotations: nil)
+      def initialize(uri, name:, description: nil, mime_type: nil, annotations: nil)
+        raise ArgumentError, "uri must be a non-empty string" unless uri.is_a?(String) && uri.present?
+        raise ArgumentError, "name must be a non-empty string" unless name.is_a?(String) && name.present?
+        unless description.nil? || description.is_a?(String)
+          raise ArgumentError, "description must be a string or nil"
+        end
+        unless mime_type.nil? || mime_type.is_a?(String)
+          raise ArgumentError, "mime_type must be a string or nil"
+        end
+
         super("resource_link", annotations: annotations)
         @uri = uri
         @name = name
         @description = description
         @mime_type = mime_type
+        to_h
       end
 
       # Returns a hash representation of the resource link content.
       #
       # @return [Hash] The hash representation of the resource link content.
       def to_h
-        result = super.merge(uri: @uri)
-        result[:name] = @name if @name
+        result = super.merge(uri: @uri, name: @name)
         result[:description] = @description if @description
         result[:mimeType] = @mime_type if @mime_type
+        Validation.validate_content_block!(result)
         result
       end
     end

data/lib/action_mcp/content/text.rb

@@ -14,13 +14,14 @@ module ActionMCP
       def initialize(text, annotations: nil)
         super("text", annotations: annotations)
         @text = text.to_s
+        to_h
       end
 
       # Returns a hash representation of the text content.
       #
       # @return [Hash] The hash representation of the text content.
       def to_h
-        super.merge(text: @text)
+        super.merge(text: @text).tap { |result| Validation.validate_content_block!(result) }
       end
     end
   end