legion-mcp 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd343295ee4f59ac0614a3058aabfac15045eb01dd0b5e9dc5506f420059d577
-  data.tar.gz: 0cb3173967bcdb22b7c2d230f173c26d4884dc05b2acbbb5d000041c2509e4aa
+  metadata.gz: 1f74d80bf3fc37b0b0130f77f38d7b1611c3efa6ab193085022d3aa1462e3ad4
+  data.tar.gz: a9ca6d64d2f3c089a787258e4ac88855d9f5d149c22eef1863bfa429157b70ed
 SHA512:
-  metadata.gz: 56c5321aa074674433bf222fd3e513217b983e11712dad1d1fff24bab90e0de9acf0896c3d54f38a67f585ef666ffb0d5e538de787e28e04f9f8e00f59ba3787
-  data.tar.gz: 4950bfc2b5a43bb7ef7dabb34d3b93258611b9d85a551910793dac1229f463b464ea0c44cfc690bb7a729b44493fdb4b1fe0fe9801f0f0e4cc9cbe657b2dfc2d
+  metadata.gz: cd0bf2a74ac997e5ce7db2bee56a6e9d821f6244ba211c41be054700bfeb7037c557079b6616403a4f188193133d2b2087f496a0ea7be43eec96694e6feed9b9
+  data.tar.gz: af2d74fa1eeb888753a815af65e9a4527fc00d44dfdf4941abc9955f1da539606f3284413518b0b618bcd50c71894ef5f37750154cbf3f35ae224390a89b4204

data/.gitignore

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

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # legion-mcp Changelog
 
-## [Unreleased]
+## [0.7.4] - 2026-04-06
+
+### Changed
+- `STATIC_TOOLS` renamed to `MCP_SPECIFIC_TOOLS` (6 MCP-only tools)
+- `Catalog::Registry` calls replaced with `Tools::Registry` in catalog_dispatcher
+
+### Removed
+- `CatalogBridge` module (replaced by `Tools::Registry`)
+- `dynamic_tool_list`, `dispatch_catalog_tool`, `register_catalog_listener` from server.rb
+- Stale spec files for catalog integration
 
 ## [0.7.2] - 2026-04-03
 

data/CLAUDE.md

@@ -7,7 +7,7 @@
 Standalone gem providing the Model Context Protocol (MCP) server for LegionIO. Extracted from LegionIO to enable independent versioning and reuse. Includes semantic tool matching, observation pipeline, context compilation, tiered inference (Tier 0/1/2), and tool governance.
 
 **GitHub**: https://github.com/LegionIO/legion-mcp
-**Version**: 0.6.2
+**Version**: 0.7.4
 **License**: Apache-2.0
 **Ruby**: >= 3.4
 
@@ -15,20 +15,30 @@ Standalone gem providing the Model Context Protocol (MCP) server for LegionIO. E
 
 ```
 Legion::MCP
-├── Server              # MCP::Server builder, TOOL_CLASSES registration, governance-aware build
+├── Server              # MCP::Server builder, governance-aware build; tool list sourced from Legion::Tools::Registry via DeferredRegistry
 ├── Auth                # JWT + API key authentication
 ├── ToolGovernance      # Risk-tier tool filtering + invocation audit
 ├── ContextCompiler     # Keyword + semantic tool matching, blended scoring (60% semantic + 40% keyword)
-├── EmbeddingIndex      # In-memory vector cache for semantic tool matching
+├── EmbeddingIndex      # Semantic tool matching; delegates embedding persistence to Tools::EmbeddingCache (L0-L4)
 ├── Observer            # Instrumentation pipeline: counters, ring buffer, pattern promotion
 ├── UsageFilter         # Frequency/recency/keyword scoring for dynamic tool filtering
 ├── PatternStore        # 4-layer degrading storage (L0 memory, L1 cache, L2 local SQLite)
 ├── TierRouter          # Confidence-gated tier selection (Tier 0/1/2)
 ├── ContextGuard        # Staleness, rapid-fire, anomaly detection guards
-├── Tools/              # 59 MCP::Tool subclasses (legion.* namespace)
+├── ToolAdapter         # Adapts Legion::Tools::Base subclasses to MCP SDK format (McpToolAdapter kept as alias)
+├── DeferredRegistry    # Reads deferred tools from Legion::Tools::Registry at request time
+├── Tools/              # MCP_SPECIFIC_TOOLS only (6 registered); remaining tool files exist but are not registered in Server.tool_registry — extension tools discovered via Legion::Tools::Discovery
 └── Resources/          # RunnerCatalog, ExtensionInfo
 ```
 
+### Tool Registry Migration Notes
+
+- **Before**: legion-mcp owned 57+ individual `Tools/*.rb` files registered in `TOOL_CLASSES`.
+- **After**: Tools discovered dynamically via `Legion::Tools::Discovery` from extension `runner_modules` at boot. `Legion::Tools::Registry` classifies each as `:always` or `:deferred`. `DeferredRegistry` resolves the deferred set at request time.
+- `MCP_SPECIFIC_TOOLS` (6 tools) covers MCP-only concerns not owned by any extension.
+- `CatalogBridge` removed — bridged old `Extensions::Capability` / `Catalog::Registry` which no longer exist.
+- `EmbeddingIndex` uses `Legion::Tools::EmbeddingCache` (5-tier L0–L4) instead of its own in-memory store.
+
 ## Dependencies
 
 | Gem | Required | Purpose |
@@ -65,17 +75,19 @@ All optional dependencies use `defined?()` guards:
 |------|---------|
 | `lib/legion/mcp.rb` | Entry point: `Legion::MCP.server` singleton factory |
 | `lib/legion/mcp/version.rb` | `Legion::MCP::VERSION` constant |
-| `lib/legion/mcp/server.rb` | MCP::Server builder, TOOL_CLASSES array, governance-aware build |
+| `lib/legion/mcp/server.rb` | MCP::Server builder, governance-aware build; reads tools from Tools::Registry |
 | `lib/legion/mcp/auth.rb` | JWT + API key authentication |
 | `lib/legion/mcp/tool_governance.rb` | Risk-tier tool filtering + invocation audit |
 | `lib/legion/mcp/context_compiler.rb` | Keyword + semantic tool matching (60/40 blend) |
-| `lib/legion/mcp/embedding_index.rb` | In-memory vector cache for semantic matching |
+| `lib/legion/mcp/embedding_index.rb` | Semantic tool matching; delegates persistence to Legion::Tools::EmbeddingCache |
 | `lib/legion/mcp/observer.rb` | Instrumentation: counters, ring buffer, pattern promotion |
 | `lib/legion/mcp/usage_filter.rb` | Frequency/recency/keyword scoring for dynamic tool filtering |
 | `lib/legion/mcp/pattern_store.rb` | 4-layer degrading storage (L0/L1/L2) with thread-safe access |
 | `lib/legion/mcp/tier_router.rb` | Confidence-gated tier selection, tool chain execution |
 | `lib/legion/mcp/context_guard.rb` | Staleness, rapid-fire, anomaly detection |
-| `lib/legion/mcp/tools/` | 59 MCP::Tool subclasses (legion.* namespace) |
+| `lib/legion/mcp/tool_adapter.rb` | MCP::ToolAdapter — wraps Legion::Tools::Base for MCP SDK (McpToolAdapter kept as alias) |
+| `lib/legion/mcp/deferred_registry.rb` | DeferredRegistry — reads deferred tools from Legion::Tools::Registry at request time |
+| `lib/legion/mcp/tools/` | All tool implementations; only MCP_SPECIFIC_TOOLS (6 tools) registered in Server.tool_registry — extension tools sourced via Legion::Tools::Discovery |
 | `lib/legion/mcp/tools/do_action.rb` | Natural language intent routing with Tier 0 fast path |
 | `lib/legion/mcp/tools/discover_tools.rb` | Dynamic tool discovery with context |
 | `lib/legion/mcp/tools/run_task.rb` | Execute runner function via dot notation |

data/lib/legion/mcp/catalog_dispatcher.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'logging_support'
+require_relative 'tool_adapter'
 
 module Legion
   module MCP
@@ -113,35 +114,16 @@ module Legion
       end
 
       def generate_tools_from_catalog
-        return [] unless defined?(Legion::Extensions::Catalog::Registry)
-        return [] unless Legion::Extensions::Catalog::Registry.respond_to?(:for_mcp)
+        return [] unless defined?(Legion::Tools::Registry)
+        return [] unless Legion::Tools::Registry.respond_to?(:all_tools)
 
-        Legion::Extensions::Catalog::Registry.for_mcp.filter_map do |cap|
-          raw_name = cap.respond_to?(:mcp_name) ? cap.mcp_name : "legion.catalog.#{cap.function}"
-          build_tool_class(
-            runner_class: resolve_runner_class(cap),
-            function:     cap.function,
-            tool_name:    sanitize_tool_name(raw_name),
-            description:  cap.respond_to?(:description) ? cap.description : "Auto-generated: #{cap.function}",
-            input_schema: cap.respond_to?(:input_schema) ? cap.input_schema : { properties: {} },
-            category:     cap.respond_to?(:category) ? cap.category : nil,
-            tier:         cap.respond_to?(:tier) ? cap.tier : nil
-          )
+        Legion::Tools::Registry.all_tools.filter_map do |tool_class|
+          ToolAdapter.from_legion_tool(tool_class) if defined?(ToolAdapter) && ToolAdapter.respond_to?(:from_legion_tool)
         rescue StandardError => e
           handle_exception(e, level: :debug, operation: 'legion.mcp.catalog_dispatcher.generate_tools_from_catalog')
-          log.debug("CatalogDispatcher: skipping #{cap}: #{e.message}")
           nil
         end
       end
-
-      def resolve_runner_class(cap)
-        segments = cap.extension.delete_prefix('lex-').split('-')
-        (%w[Legion Extensions] + segments.map(&:capitalize) + ['Runners', cap.runner]).join('::')
-      end
-
-      def sanitize_tool_name(name)
-        name.gsub(/[^A-Za-z0-9_.-]/, '')
-      end
     end
   end
 end

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,164 +3,61 @@
 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'
 require_relative 'deferred_registry'
 require_relative 'catalog_dispatcher'
 require_relative 'dynamic_injector'
-require_relative 'catalog_bridge'
 require_relative 'resources/runner_catalog'
 require_relative 'resources/extension_info'
 
 module Legion
   module MCP
     module Server
-      STATIC_TOOLS = [
-        Tools::RunTask,
-        Tools::DescribeRunner,
-        Tools::ListTasks,
-        Tools::GetTask,
-        Tools::DeleteTask,
-        Tools::GetTaskLogs,
-        Tools::ListChains,
-        Tools::CreateChain,
-        Tools::UpdateChain,
-        Tools::DeleteChain,
-        Tools::ListRelationships,
-        Tools::CreateRelationship,
-        Tools::UpdateRelationship,
-        Tools::DeleteRelationship,
-        Tools::ListExtensions,
-        Tools::GetExtension,
-        Tools::EnableExtension,
-        Tools::DisableExtension,
-        Tools::ListSchedules,
-        Tools::CreateSchedule,
-        Tools::UpdateSchedule,
-        Tools::DeleteSchedule,
-        Tools::GetStatus,
-        Tools::GetConfig,
-        Tools::ListWorkers,
-        Tools::ShowWorker,
-        Tools::WorkerLifecycle,
-        Tools::WorkerCosts,
-        Tools::TeamSummary,
-        Tools::RoutingStats,
-        Tools::RbacCheck,
-        Tools::RbacAssignments,
-        Tools::RbacGrants,
-        Tools::PromptList,
-        Tools::PromptShow,
-        Tools::PromptRun,
-        Tools::DatasetList,
-        Tools::DatasetShow,
-        Tools::ExperimentResults,
-        Tools::EvalList,
-        Tools::EvalRun,
-        Tools::EvalResults,
-        Tools::DoAction,
+      # MCP-specific tools not owned by any extension.
+      # All extension-owned tools are discovered via Legion::Tools::Registry.
+      MCP_SPECIFIC_TOOLS = [
         Tools::PlanAction,
         Tools::DiscoverTools,
-        Tools::AskPeer,
-        Tools::ListPeers,
-        Tools::NotifyPeer,
-        Tools::BroadcastPeers,
-        Tools::MeshStatus,
-        Tools::MindGrowthStatus,
-        Tools::MindGrowthPropose,
-        Tools::MindGrowthApprove,
-        Tools::MindGrowthBuildQueue,
-        Tools::MindGrowthCognitiveProfile,
-        Tools::MindGrowthHealth,
-        Tools::QueryKnowledge,
-        Tools::KnowledgeHealth,
-        Tools::KnowledgeContext,
-        Tools::Absorb,
         Tools::StructuralIndexTool,
         Tools::ToolAudit,
         Tools::StateDiff,
         Tools::SearchSessions
       ].freeze
 
-      @tool_registry = Concurrent::Array.new(STATIC_TOOLS)
+      @tool_registry = Concurrent::Array.new(MCP_SPECIFIC_TOOLS)
       @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(MCP_SPECIFIC_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 +89,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
+          run_function_discovery
+          rebuild_tool_registry
+
           LoggingSupport.info(
             'server.build.start',
             identity:      LoggingSupport.summarize_identity(identity),
@@ -224,14 +124,11 @@ 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
           populate_embedding_index
 
           Resources::RunnerCatalog.register(server)
           Resources::ExtensionInfo.register_read_handler(server)
 
-          register_catalog_listener
           hydrate_override_confidence
 
           LoggingSupport.info(
@@ -309,6 +206,19 @@ module Legion
 
         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,42 @@
+# frozen_string_literal: true
+
+module Legion
+  module MCP
+    class ToolAdapter < ::MCP::Tool
+      class << self
+        MCP_NAME_PATTERN = /[^a-zA-Z0-9_-]/
+
+        def sanitize_tool_name(name)
+          name.to_s.gsub(MCP_NAME_PATTERN, '_').slice(0, 64)
+        end
+
+        def from_legion_tool(tool_class)
+          safe_name = sanitize_tool_name(tool_class.tool_name)
+          Class.new(::MCP::Tool) do
+            tool_name safe_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.4'
   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.4
 platform: ruby
 authors:
 - Esity
@@ -122,7 +122,6 @@ files:
 - lib/legion/mcp.rb
 - lib/legion/mcp/actors/self_generate_cycle.rb
 - lib/legion/mcp/auth.rb
-- lib/legion/mcp/catalog_bridge.rb
 - lib/legion/mcp/catalog_dispatcher.rb
 - lib/legion/mcp/client.rb
 - lib/legion/mcp/client/connection.rb
@@ -152,6 +151,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 +218,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

data/lib/legion/mcp/catalog_bridge.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-module Legion
-  module MCP
-    module CatalogBridge
-      include Legion::Logging::Helper
-
-      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 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
-
-      def dispatch_catalog_tool(tool_name, arguments)
-        log.info('Starting legion.mcp.catalog_bridge.dispatch_catalog_tool')
-        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.catalog_bridge.dispatch_catalog_tool')
-        log.warn("Catalog dispatch failed: #{e.message}")
-        nil
-      rescue StandardError => e
-        handle_exception(e, level: :error, operation: 'legion.mcp.catalog_bridge.dispatch_catalog_tool')
-        { status: :error, error: e.message, source: :catalog }
-      end
-
-      def register_catalog_tools
-        log.info('Starting legion.mcp.catalog_bridge.register_catalog_tools')
-        CatalogDispatcher.generate_tools_from_catalog.each { |tc| Server.register_tool(tc) }
-      end
-
-      def dynamic_tool_list
-        static = Server.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
-    end
-  end
-end