mcp_toolkit 0.4.0 → 0.5.0

data/lib/mcp_toolkit/tools/resources.rb

@@ -5,9 +5,10 @@ class McpToolkit::Tools::Resources < McpToolkit::Tools::Base
   tool_name "resources"
   description <<~DESC.strip
     List all read-only resources available via the `list` and `get` tools. Returns each
-    resource's name and a short description. Call this once at the start of a session to learn
-    what exists, then use `resource_schema` for a specific resource's attributes and
-    relationships.
+    resource's name, a short description, whether it accepts filters (`filterable`) and — when
+    present — a usage `note` (read it before interpreting the resource's data). Call this once
+    at the start of a session to learn what exists, then use `resource_schema` for a specific
+    resource's attributes, relationships and filters.
   DESC
 
   input_schema(properties: {})
@@ -16,12 +17,34 @@ class McpToolkit::Tools::Resources < McpToolkit::Tools::Base
     config = config_from(server_context)
     # Discovery requires the registry-level default scope (the satellite's
     # app-wide scope); per-resource scopes are enforced by `get` / `list`.
-    with_authentication(server_context, required_scope: config.registry.default_required_permissions_scope) do
+    with_authentication(server_context,
+                        required_scope: config.registry.default_required_permissions_scope) do |introspection|
       {
-        resources: config.registry.resources.map do |resource|
-          { name: resource.name, description: resource.description }
-        end
+        resources: config.registry.resources
+                         .reject { |resource| resource.superusers_only? && !introspection.superuser? }
+                         .map do |resource|
+                           {
+                             name: resource.name,
+                             description: resource.description,
+                             filterable: filterable?(resource, config),
+                             note: resource.note
+                           }.compact
+                         end
       }
     end
   end
+
+  # Whether the resource can be filtered at all — via the generic allowlist OR a
+  # resource-specific custom filter. Mirrors the authority-path resources tool:
+  # resolving a lazily-declared allowlist may run host code, and one resource's
+  # failing resolution must not take down the whole discovery index, so a raise
+  # degrades to nil (the key is omitted) and the source is retried on the next
+  # read (see Resource#filterable).
+  def self.filterable?(resource, config)
+    resource.filterable_columns.any? || resource.custom_filters.any?
+  rescue StandardError => e
+    config.logger&.warn("mcp_toolkit: filterable resolution failed for #{resource.name}: #{e.message}")
+    nil
+  end
+  private_class_method :filterable?
 end

data/lib/mcp_toolkit/usage_metering/recorder.rb

@@ -65,18 +65,44 @@ class McpToolkit::UsageMetering::Recorder
   end
 
   # `config.usage_flusher` target. Persists the request's accumulated events via the
-  # sink in one shot. No-op when nothing was accumulated.
+  # sink in one shot. No-op when nothing was accumulated. If the batch write fails,
+  # falls back to per-event writes so one un-persistable ("poison") event can't drop
+  # metering for the whole request.
   def flush(controller:)
     events = buffer_for(controller)
     return if events.empty?
 
     @sink.call(events)
   rescue StandardError => e
-    report("failed to flush #{events&.size} event(s)", e)
+    flush_individually(events, e)
   end
 
   private
 
+  # The batch write failed. Retry each event on its own so a single un-persistable
+  # event (a constraint violation, bad encoding) loses ONLY itself instead of
+  # dropping every sibling call's metering — which a caller could otherwise
+  # exploit to evade billing for a whole batch by appending one poison call.
+  # Assumes the batch sink is atomic (nothing persisted on failure — true for
+  # `insert_all`); a non-atomic sink could double-write the events that did land,
+  # so this stays a fallback, not the default path.
+  def flush_individually(events, batch_error)
+    @logger&.warn(
+      "MCP usage tracking: batch flush of #{events.size} event(s) failed " \
+      "(#{batch_error.message}), retrying individually"
+    )
+    events.each do |event|
+      @sink.call([event])
+    rescue StandardError => e
+      report("dropped 1 unpersistable usage event", e)
+    end
+  rescue StandardError
+    # Metering MUST NEVER affect the MCP response. `flush` already runs this from
+    # its rescue, so a raise here (e.g. a misbehaving logger or error_reporter)
+    # would escape into the after_action. Swallow it as the last resort.
+    nil
+  end
+
   def scrub(arguments)
     hash = arguments.to_h
     @parameter_filter ? @parameter_filter.filter(hash) : hash

data/lib/mcp_toolkit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module McpToolkit
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcp_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Karol Galanciak
@@ -109,6 +109,7 @@ files:
 - lib/mcp_toolkit/authority/context.rb
 - lib/mcp_toolkit/authority/controller_methods.rb
 - lib/mcp_toolkit/authority/registry_tool_provider.rb
+- lib/mcp_toolkit/authority/single_tool_provider.rb
 - lib/mcp_toolkit/authority/token.rb
 - lib/mcp_toolkit/authority/tools/base.rb
 - lib/mcp_toolkit/authority/tools/get.rb
@@ -139,11 +140,14 @@ files:
 - lib/mcp_toolkit/resource.rb
 - lib/mcp_toolkit/resource_schema.rb
 - lib/mcp_toolkit/serialization.rb
+- lib/mcp_toolkit/serializer/association_descriptor.rb
 - lib/mcp_toolkit/serializer/base.rb
+- lib/mcp_toolkit/serializer/target_ref.rb
 - lib/mcp_toolkit/server.rb
 - lib/mcp_toolkit/session.rb
 - lib/mcp_toolkit/sql_sanitizer.rb
 - lib/mcp_toolkit/token_kinds.rb
+- lib/mcp_toolkit/tool_reference_rewriter.rb
 - lib/mcp_toolkit/tools/authority_base.rb
 - lib/mcp_toolkit/tools/base.rb
 - lib/mcp_toolkit/tools/get.rb