legion-mcp 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd343295ee4f59ac0614a3058aabfac15045eb01dd0b5e9dc5506f420059d577
-  data.tar.gz: 0cb3173967bcdb22b7c2d230f173c26d4884dc05b2acbbb5d000041c2509e4aa
+  metadata.gz: 60a58443e45b7bb2ffc897534a7b092bf4d5c152b2206e4268a8a8c9ff6a1755
+  data.tar.gz: 178682013f6738d801d382b32e85161044c2ed48a0e8cc979a0361f542fa0f70
 SHA512:
-  metadata.gz: 56c5321aa074674433bf222fd3e513217b983e11712dad1d1fff24bab90e0de9acf0896c3d54f38a67f585ef666ffb0d5e538de787e28e04f9f8e00f59ba3787
-  data.tar.gz: 4950bfc2b5a43bb7ef7dabb34d3b93258611b9d85a551910793dac1229f463b464ea0c44cfc690bb7a729b44493fdb4b1fe0fe9801f0f0e4cc9cbe657b2dfc2d
+  metadata.gz: 0b18864b7e771313db5d679018614dfd3b380fa2d55eb4f954310f90881efe04bc49c082e090db7e6b2b0b405c48a9b91d62f35ffb6a268ff64b2a9652c8f1db
+  data.tar.gz: 26b516e3471032d36cbcc580fed82da09615be5dd0777321ed3147d020afe2260dab6175ab086a4e3cfa60471160b481a2de99c9d55e328e0925bf534e2a6b36

data/.gitignore

@@ -4,3 +4,4 @@ pkg/
 *.gem
 .bundle/
 vendor/
+.worktrees

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## [Unreleased]
 
+### Added
+- `Legion::MCP::ToolAdapter` - wraps Tools::Base into MCP::Tool
+- `rebuild_tool_registry` method for dynamic tool registration
+
+### Changed
+- Tool registry populated from `Legion::Tools::Registry` via ToolAdapter
+- `DeferredRegistry` reads canonical classification with `reset_cache!`
+- `EmbeddingIndex` uses `Tools::EmbeddingCache` for persistent caching
+- `FunctionDiscovery` delegates to `Tools::Discovery` with double-fire guard
+
+### Removed
+- Direct tool ownership (tools live in LegionIO now)
+
 ## [0.7.2] - 2026-04-03
 
 ### Fixed

data/lib/legion/mcp/deferred_registry.rb

@@ -23,14 +23,25 @@ module Legion
 
       module_function
 
+      def reset_cache!
+        @always_loaded_cache = nil
+      end
+
       def enabled?
         setting = Legion::Settings.dig(:mcp, :deferred_loading, :enabled)
         setting.nil? || setting
       end
 
       def always_loaded_tools
+        return @always_loaded_cache if @always_loaded_cache
+
+        base = ALWAYS_LOADED.dup
+        if defined?(Legion::Tools::Registry) && Legion::Tools::Registry.respond_to?(:tools)
+          registry_always = Legion::Tools::Registry.tools(:always)
+          base |= registry_always.map(&:tool_name) if registry_always.is_a?(Array)
+        end
         custom = Legion::Settings.dig(:mcp, :deferred_loading, :always_loaded)
-        custom.is_a?(Array) ? (ALWAYS_LOADED | custom) : ALWAYS_LOADED
+        @always_loaded_cache = custom.is_a?(Array) ? (base | custom) : base
       end
 
       def deferred?(tool_class)

data/lib/legion/mcp/embedding_index.rb

@@ -10,9 +10,25 @@ module Legion
       def build_from_tool_data(tool_data, embedder: default_embedder)
         @embedder = embedder
         mutex.synchronize do
-          tool_data.each do |tool|
-            composite = build_composite(tool[:name], tool[:description], tool[:params])
+          composites = tool_data.to_h do |tool|
+            [tool[:name], build_composite(tool[:name], tool[:description], tool[:params])]
+          end
+
+          cached_vectors = bulk_cache_lookup(composites.values)
+
+          uncached_names = composites.keys.reject { |name| cached_vectors.key?(composites[name]) }
+          newly_embedded = {}
+          uncached_names.each do |name|
+            composite = composites[name]
             vector = safe_embed(composite, embedder)
+            newly_embedded[composite] = vector if vector
+          end
+
+          bulk_cache_store(newly_embedded) unless newly_embedded.empty?
+
+          tool_data.each do |tool|
+            composite = composites[tool[:name]]
+            vector = cached_vectors[composite] || newly_embedded[composite]
             next unless vector
 
             index[tool[:name]] = {
@@ -86,6 +102,26 @@ module Legion
         @mutex ||= Mutex.new
       end
 
+      def bulk_cache_lookup(composite_texts)
+        return {} unless defined?(Legion::Tools::EmbeddingCache) &&
+                         Legion::Tools::EmbeddingCache.respond_to?(:bulk_lookup)
+
+        Legion::Tools::EmbeddingCache.bulk_lookup(composite_texts)
+      rescue StandardError => e
+        handle_exception(e, level: :debug, operation: 'legion.mcp.embedding_index.bulk_cache_lookup')
+        {}
+      end
+
+      def bulk_cache_store(composite_to_vector)
+        return unless defined?(Legion::Tools::EmbeddingCache) &&
+                      Legion::Tools::EmbeddingCache.respond_to?(:bulk_store)
+
+        Legion::Tools::EmbeddingCache.bulk_store(composite_to_vector)
+      rescue StandardError => e
+        handle_exception(e, level: :debug, operation: 'legion.mcp.embedding_index.bulk_cache_store')
+        nil
+      end
+
       def build_composite(name, description, params)
         parts = [name, '--', description]
         parts << "Params: #{params.join(', ')}" unless params.empty?

data/lib/legion/mcp/function_discovery.rb

@@ -7,7 +7,16 @@ module Legion
 
       module_function
 
-      def discover_and_register
+      def discover_and_register # rubocop:disable Metrics/PerceivedComplexity
+        return if @discovery_fired
+
+        @discovery_fired = true
+
+        if defined?(Legion::Tools::Discovery) && Legion::Tools::Discovery.respond_to?(:discover_and_register)
+          Legion::Tools::Discovery.discover_and_register
+          return
+        end
+
         return unless defined?(Legion::Extensions)
 
         extensions =
@@ -26,6 +35,10 @@ module Legion
         end
       end
 
+      def reset_discovery!
+        @discovery_fired = false
+      end
+
       def build_tools_from_runner(runner_module)
         return unless runner_module.respond_to?(:settings) && runner_module.settings.is_a?(Hash)
 

data/lib/legion/mcp/server.rb

@@ -3,76 +3,14 @@
 require_relative 'observer'
 require_relative 'logging_support'
 require_relative 'usage_filter'
-require_relative 'tools/run_task'
-require_relative 'tools/describe_runner'
-require_relative 'tools/list_tasks'
-require_relative 'tools/get_task'
-require_relative 'tools/delete_task'
-require_relative 'tools/get_task_logs'
-require_relative 'tools/list_chains'
-require_relative 'tools/create_chain'
-require_relative 'tools/update_chain'
-require_relative 'tools/delete_chain'
-require_relative 'tools/list_relationships'
-require_relative 'tools/create_relationship'
-require_relative 'tools/update_relationship'
-require_relative 'tools/delete_relationship'
-require_relative 'tools/list_extensions'
-require_relative 'tools/get_extension'
-require_relative 'tools/enable_extension'
-require_relative 'tools/disable_extension'
-require_relative 'tools/list_schedules'
-require_relative 'tools/create_schedule'
-require_relative 'tools/update_schedule'
-require_relative 'tools/delete_schedule'
-require_relative 'tools/get_status'
-require_relative 'tools/get_config'
-require_relative 'tools/list_workers'
-require_relative 'tools/show_worker'
-require_relative 'tools/worker_lifecycle'
-require_relative 'tools/worker_costs'
-require_relative 'tools/team_summary'
-require_relative 'tools/routing_stats'
-require_relative 'tools/rbac_check'
-require_relative 'tools/rbac_assignments'
-require_relative 'tools/rbac_grants'
-require_relative 'tools/prompt_list'
-require_relative 'tools/prompt_show'
-require_relative 'tools/prompt_run'
-require_relative 'tools/dataset_list'
-require_relative 'tools/dataset_show'
-require_relative 'tools/experiment_results'
-require_relative 'tools/eval_list'
-require_relative 'tools/eval_run'
-require_relative 'tools/eval_results'
+require_relative 'tools_loader'
+require_relative 'tool_adapter'
 require_relative 'context_compiler'
 require_relative 'embedding_index'
 require_relative 'cold_start'
 require_relative 'gap_detector'
 require_relative 'function_discovery'
 require_relative 'self_generate'
-require_relative 'tools/do_action'
-require_relative 'tools/plan_action'
-require_relative 'tools/discover_tools'
-require_relative 'tools/ask_peer'
-require_relative 'tools/list_peers'
-require_relative 'tools/notify_peer'
-require_relative 'tools/broadcast_peers'
-require_relative 'tools/mesh_status'
-require_relative 'tools/mind_growth_status'
-require_relative 'tools/mind_growth_propose'
-require_relative 'tools/mind_growth_approve'
-require_relative 'tools/mind_growth_build_queue'
-require_relative 'tools/mind_growth_cognitive_profile'
-require_relative 'tools/mind_growth_health'
-require_relative 'tools/query_knowledge'
-require_relative 'tools/knowledge_health'
-require_relative 'tools/knowledge_context'
-require_relative 'tools/absorb'
-require_relative 'tools/structural_index'
-require_relative 'tools/tool_audit'
-require_relative 'tools/state_diff'
-require_relative 'tools/search_sessions'
 require_relative 'structural_index'
 require_relative 'state_tracker'
 require_relative 'tool_quality'
@@ -85,7 +23,8 @@ require_relative 'resources/extension_info'
 
 module Legion
   module MCP
-    module Server
+    module Server # rubocop:disable Metrics/ModuleLength
+      # All built-in tool classes loaded via tools_loader.rb
       STATIC_TOOLS = [
         Tools::RunTask,
         Tools::DescribeRunner,
@@ -157,10 +96,26 @@ module Legion
       @tool_registry_lock = Mutex.new
 
       class << self # rubocop:disable Metrics/ClassLength
-        include CatalogBridge
-
         attr_reader :tool_registry
 
+        def rebuild_tool_registry
+          @tool_registry_lock.synchronize do
+            @tool_registry = Concurrent::Array.new(STATIC_TOOLS)
+
+            if defined?(Legion::Tools::Registry) && Legion::Tools::Registry.respond_to?(:all_tools)
+              Legion::Tools::Registry.all_tools.each do |legion_tool_class|
+                next if @tool_registry.any? { |tc| tc.tool_name == legion_tool_class.tool_name }
+
+                adapted = ToolAdapter.from_legion_tool(legion_tool_class)
+                @tool_registry << adapted
+              end
+            end
+
+            DeferredRegistry.reset_cache! if defined?(DeferredRegistry) && DeferredRegistry.respond_to?(:reset_cache!)
+            reset_caches!
+          end
+        end
+
         def register_tool(tool_class)
           @tool_registry_lock.synchronize do
             return if tool_registry.any? { |tc| tc.tool_name == tool_class.tool_name }
@@ -192,7 +147,10 @@ module Legion
           EmbeddingIndex.reset! if defined?(EmbeddingIndex) && EmbeddingIndex.respond_to?(:reset!)
         end
 
-        def build(identity: nil) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        def build(identity: nil) # rubocop:disable Metrics/MethodLength
+          rebuild_tool_registry
+          register_catalog_listener
+
           LoggingSupport.info(
             'server.build.start',
             identity:      LoggingSupport.summarize_identity(identity),
@@ -224,14 +182,12 @@ module Legion
 
           PatternStore.hydrate_from_l2 if defined?(PatternStore)
           ColdStart.load_community_patterns if defined?(ColdStart)
-          FunctionDiscovery.discover_and_register if defined?(Legion::Extensions)
-          register_catalog_tools
+          run_function_discovery
           populate_embedding_index
 
           Resources::RunnerCatalog.register(server)
           Resources::ExtensionInfo.register_read_handler(server)
 
-          register_catalog_listener
           hydrate_override_confidence
 
           LoggingSupport.info(
@@ -307,8 +263,63 @@ module Legion
           end
         end
 
+        def dynamic_tool_list
+          static = tool_registry.map do |klass|
+            { name: klass.tool_name, description: klass.description,
+              input_schema: klass.input_schema, source: :builtin, klass: klass }
+          end
+
+          dynamic = if defined?(Legion::Extensions::Catalog::Registry)
+                      Legion::Extensions::Catalog::Registry.for_mcp.map(&:to_mcp_tool)
+                    else
+                      []
+                    end
+
+          static + dynamic
+        end
+
+        def dispatch_catalog_tool(tool_name, arguments)
+          return nil unless defined?(Legion::Extensions::Catalog::Registry)
+
+          cap = Legion::Extensions::Catalog::Registry.find_by_mcp_name(tool_name)
+          return nil unless cap
+
+          segments = cap.extension.delete_prefix('lex-').split('-')
+          runner_path = (%w[Legion Extensions] + segments.map(&:capitalize) + ['Runners', cap.runner]).join('::')
+          runner = Kernel.const_get(runner_path)
+          fn = cap.function.to_sym
+          result = runner.send(fn, **(arguments || {}).transform_keys(&:to_sym))
+          { status: :success, result: result, source: :catalog }
+        rescue NameError => e
+          handle_exception(e, level: :warn, operation: 'legion.mcp.server.dispatch_catalog_tool')
+          nil
+        rescue StandardError => e
+          handle_exception(e, level: :error, operation: 'legion.mcp.server.dispatch_catalog_tool')
+          { status: :error, error: e.message, source: :catalog }
+        end
+
+        def register_catalog_listener
+          return unless defined?(Legion::Extensions::Catalog::Registry)
+          return unless Legion::Extensions::Catalog::Registry.respond_to?(:on_change)
+
+          Legion::Extensions::Catalog::Registry.on_change { Legion::MCP.reset! }
+        end
+
         private
 
+        def run_function_discovery
+          FunctionDiscovery.reset_discovery!
+          FunctionDiscovery.discover_and_register
+        end
+
+        def hydrate_override_confidence
+          return unless defined?(Legion::LLM::OverrideConfidence)
+          return unless Legion::LLM::OverrideConfidence.respond_to?(:hydrate_from_l2)
+
+          Legion::LLM::OverrideConfidence.hydrate_from_l2
+          Legion::LLM::OverrideConfidence.hydrate_from_apollo if Legion::LLM::OverrideConfidence.respond_to?(:hydrate_from_apollo)
+        end
+
         def install_deferred_tools_list_handler(server)
           handlers = server.instance_variable_get(:@handlers)
           return unless handlers

data/lib/legion/mcp/tool_adapter.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Legion
+  module MCP
+    class ToolAdapter < ::MCP::Tool
+      class << self
+        def from_legion_tool(tool_class)
+          Class.new(::MCP::Tool) do
+            tool_name tool_class.tool_name
+            description tool_class.description
+            input_schema(tool_class.input_schema || { properties: {} })
+
+            define_singleton_method(:legion_tool_class) { tool_class }
+
+            define_singleton_method(:call) do |**params|
+              result = tool_class.call(**params)
+              if result.is_a?(Hash) && result[:content]
+                content = result[:content].map do |c|
+                  { type: c[:type] || 'text', text: c[:text] || '' }
+                end
+                ::MCP::Tool::Response.new(content, error: result[:error] || false)
+              else
+                text = result.is_a?(String) ? result : Legion::JSON.dump(result)
+                error = result.is_a?(Hash) ? !!result[:error] : false
+                ::MCP::Tool::Response.new([{ type: 'text', text: text }], error: error)
+              end
+            rescue StandardError => e
+              ::MCP::Tool::Response.new([{ type: 'text', text: Legion::JSON.dump({ error: e.message }) }], error: true)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/legion/mcp/tools_loader.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+# Requires all built-in MCP tool files so they are defined as Ruby constants.
+# server.rb no longer owns these requires — Legion::Tools::Registry provides
+# runtime registration, but the classes must still be defined for specs and
+# for any code that references Legion::MCP::Tools::* directly.
+
+require_relative 'tools/run_task'
+require_relative 'tools/describe_runner'
+require_relative 'tools/list_tasks'
+require_relative 'tools/get_task'
+require_relative 'tools/delete_task'
+require_relative 'tools/get_task_logs'
+require_relative 'tools/list_chains'
+require_relative 'tools/create_chain'
+require_relative 'tools/update_chain'
+require_relative 'tools/delete_chain'
+require_relative 'tools/list_relationships'
+require_relative 'tools/create_relationship'
+require_relative 'tools/update_relationship'
+require_relative 'tools/delete_relationship'
+require_relative 'tools/list_extensions'
+require_relative 'tools/get_extension'
+require_relative 'tools/enable_extension'
+require_relative 'tools/disable_extension'
+require_relative 'tools/list_schedules'
+require_relative 'tools/create_schedule'
+require_relative 'tools/update_schedule'
+require_relative 'tools/delete_schedule'
+require_relative 'tools/get_status'
+require_relative 'tools/get_config'
+require_relative 'tools/list_workers'
+require_relative 'tools/show_worker'
+require_relative 'tools/worker_lifecycle'
+require_relative 'tools/worker_costs'
+require_relative 'tools/team_summary'
+require_relative 'tools/routing_stats'
+require_relative 'tools/rbac_check'
+require_relative 'tools/rbac_assignments'
+require_relative 'tools/rbac_grants'
+require_relative 'tools/prompt_list'
+require_relative 'tools/prompt_show'
+require_relative 'tools/prompt_run'
+require_relative 'tools/dataset_list'
+require_relative 'tools/dataset_show'
+require_relative 'tools/experiment_results'
+require_relative 'tools/eval_list'
+require_relative 'tools/eval_run'
+require_relative 'tools/eval_results'
+require_relative 'tools/do_action'
+require_relative 'tools/plan_action'
+require_relative 'tools/discover_tools'
+require_relative 'tools/ask_peer'
+require_relative 'tools/list_peers'
+require_relative 'tools/notify_peer'
+require_relative 'tools/broadcast_peers'
+require_relative 'tools/mesh_status'
+require_relative 'tools/mind_growth_status'
+require_relative 'tools/mind_growth_propose'
+require_relative 'tools/mind_growth_approve'
+require_relative 'tools/mind_growth_build_queue'
+require_relative 'tools/mind_growth_cognitive_profile'
+require_relative 'tools/mind_growth_health'
+require_relative 'tools/query_knowledge'
+require_relative 'tools/knowledge_health'
+require_relative 'tools/knowledge_context'
+require_relative 'tools/absorb'
+require_relative 'tools/structural_index'
+require_relative 'tools/tool_audit'
+require_relative 'tools/state_diff'
+require_relative 'tools/search_sessions'

data/lib/legion/mcp/version.rb

@@ -2,6 +2,6 @@
 
 module Legion
   module MCP
-    VERSION = '0.7.2'
+    VERSION = '0.7.3'
   end
 end

data/lib/legion/mcp.rb

@@ -9,6 +9,7 @@ require_relative 'mcp/version'
 require_relative 'mcp/settings'
 require_relative 'mcp/auth'
 require_relative 'mcp/tool_governance'
+require_relative 'mcp/tools_loader'
 require_relative 'mcp/server'
 require_relative 'mcp/override_broadcast'
 require_relative 'mcp/client'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: legion-mcp
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Esity
@@ -152,6 +152,7 @@ files:
 - lib/legion/mcp/state_tracker.rb
 - lib/legion/mcp/structural_index.rb
 - lib/legion/mcp/tier_router.rb
+- lib/legion/mcp/tool_adapter.rb
 - lib/legion/mcp/tool_governance.rb
 - lib/legion/mcp/tool_quality.rb
 - lib/legion/mcp/tools/absorb.rb
@@ -218,6 +219,7 @@ files:
 - lib/legion/mcp/tools/update_schedule.rb
 - lib/legion/mcp/tools/worker_costs.rb
 - lib/legion/mcp/tools/worker_lifecycle.rb
+- lib/legion/mcp/tools_loader.rb
 - lib/legion/mcp/usage_filter.rb
 - lib/legion/mcp/version.rb
 homepage: https://github.com/LegionIO/legion-mcp