legion-llm 0.6.15 → 0.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89101e37722ff5c0c96015b465b3231567b5636c796b49f94b4537fb2e9d0c9d
-  data.tar.gz: 383eb42f22009930320e9a952e165f1e0a8cb95530c4c2444e70fb30d2f804fe
+  metadata.gz: 0fe6246015e9967dec5bbe428ab2cb5869b4a359c4a5b40c0a8206d0fe7b516d
+  data.tar.gz: f803de963b1887d064506187c3d7c8fa00b437613f5456bcbf87adae1d53a3a4
 SHA512:
-  metadata.gz: 501e4e9051fcaa678c85f47841bdbb2a97b4de433ce8a8be5767f11f4c2a1ccbebcedaa0a9962db82c92c49d209cf4dc71b9027cccc91ec5f8f458b537ee8437
-  data.tar.gz: f822fa3df241dc19568b70e02198a86404baecc4ab1238ef45f5ac7d6079821e7b52db924ac45db42d23df5f70c15285d576d85e581efd609f79f49fa41471bc
+  metadata.gz: e7f65ec573b55b840b7b07b9a9c83c7aa189696b162936e63ad65ddf508be3240eb056fc70d3bbbad532eb2f3db841c4facd3efb1df30e9bf816b4f37d8a33e0
+  data.tar.gz: 6a823d728ab547b3ccab050d7a01e9825cb3764446eecb2f32b71ce1c7ff73f7da7f167e9198b9a45f4941b7ed8113c3aac3f1ca95c0a76b46a5b502dd713147

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [0.6.16] - 2026-04-03
+
+### Fixed
+- MCP tool adapter now correctly deserializes `MCP::Tool::Response` objects instead of returning raw `#<Response:0x...>` strings
+- Removed `is_a?(Class)` guard in executor `inject_ruby_llm_tools` that silently dropped MCP adapter instances
+- Added `cached_mcp_tools` to inference route with lazy caching (only persists when tools are available)
+
 ## [0.6.15] - 2026-04-03
 
 ### Changed

data/lib/legion/llm/pipeline/executor.rb

@@ -675,7 +675,7 @@ module Legion
 
         def inject_ruby_llm_tools(session)
           (@request.tools || []).each do |tool|
-            session.with_tool(tool) if tool.is_a?(Class)
+            session.with_tool(tool)
           end
 
           ToolRegistry.tools.each { |tool| session.with_tool(tool) } if defined?(ToolRegistry)

data/lib/legion/llm/pipeline/mcp_tool_adapter.rb

@@ -35,13 +35,7 @@ module Legion
         def execute(**args)
           log.info("[llm][tools] adapter.execute name=#{@tool_name} arguments=#{summarize_payload(args)}")
           result = @mcp_tool_class.call(**args)
-          content = if result.is_a?(Hash) && result[:content]
-                      result[:content].map { |c| c[:text] || c['text'] }.compact.join("\n")
-                    elsif result.is_a?(String)
-                      result
-                    else
-                      result.to_s
-                    end
+          content = extract_content(result)
           log.info("[llm][tools] adapter.result name=#{@tool_name} output=#{summarize_payload(content)}")
           content
         rescue StandardError => e
@@ -51,6 +45,21 @@ module Legion
 
         private
 
+        def extract_content(result)
+          # MCP::Tool::Response — has .content array of {type: 'text', text: '...'}
+          if result.respond_to?(:content) && result.content.is_a?(Array)
+            result.content.filter_map { |c| c[:text] || c['text'] || c.to_s }.join("\n")
+          elsif result.is_a?(Hash) && result[:content].is_a?(Array)
+            result[:content].filter_map { |c| c[:text] || c['text'] }.join("\n")
+          elsif result.is_a?(Hash)
+            Legion::JSON.dump(result)
+          elsif result.is_a?(String)
+            result
+          else
+            result.to_s
+          end
+        end
+
         def summarize_payload(payload)
           payload.to_s[0, 200].inspect
         end

data/lib/legion/llm/routes.rb

@@ -214,6 +214,34 @@ module Legion
           end
           # rubocop:enable Metrics/BlockLength
 
+          define_method(:cached_mcp_tools) do
+            @@llm_cached_mcp_tools ||= begin # rubocop:disable Style/ClassVars
+              all = []
+              if defined?(Legion::MCP) && Legion::MCP.respond_to?(:server)
+                Legion::MCP.server
+                if defined?(Legion::MCP::Server) && Legion::MCP::Server.respond_to?(:tool_registry)
+                  require 'legion/llm/pipeline/mcp_tool_adapter' unless defined?(Legion::LLM::Pipeline::McpToolAdapter)
+                  Legion::MCP::Server.tool_registry.each do |tc|
+                    all << Legion::LLM::Pipeline::McpToolAdapter.new(tc)
+                  rescue StandardError
+                    nil
+                  end
+                end
+              end
+              always_names = %w[legion_do legion_get_status legion_run_task legion_describe_runner
+                                legion_list_extensions legion_get_extension legion_list_tasks
+                                legion_get_task legion_get_task_logs legion_query_knowledge
+                                legion_knowledge_health legion_knowledge_context legion_list_workers
+                                legion_show_worker legion_mesh_status legion_list_peers
+                                legion_tools legion_search_sessions]
+              {
+                always:   all.select { |t| always_names.include?(t.name) }.freeze,
+                deferred: all.reject { |t| always_names.include?(t.name) }.freeze,
+                all:      all.freeze
+              }.freeze
+            end
+          end
+
           define_method(:extract_tool_calls) do |pipeline_response|
             tools_data = pipeline_response.tools
             return [] unless tools_data.is_a?(Array) && !tools_data.empty?
@@ -477,6 +505,17 @@ module Legion
             build_client_tool_class(ts[:name].to_s, ts[:description].to_s, ts[:parameters] || ts[:input_schema])
           end
 
+          # Inject daemon MCP tools alongside client tools
+          all_tools = tool_declarations.dup
+          begin
+            mcp_tools = cached_mcp_tools
+            mcp_to_inject = Array(requested_tools).empty? ? mcp_tools[:always] : mcp_tools[:all]
+            all_tools.concat(mcp_to_inject) if mcp_to_inject&.any?
+            log.unknown "[llm][api] inference tools client=#{tool_declarations.size} mcp=#{mcp_to_inject&.size || 0} total=#{all_tools.size}"
+          rescue StandardError => e
+            handle_exception(e, level: :warn, operation: 'llm.routes.mcp_tool_injection', request_id: request_id)
+          end
+
           streaming = body[:stream] == true && request.preferred_type.to_s.include?('text/event-stream')
           normalized_caller = caller_context.respond_to?(:transform_keys) ? caller_context.transform_keys(&:to_sym) : {}
           safe_caller_fields = normalized_caller.slice(:context, :session_id, :trace_id)
@@ -502,7 +541,7 @@ module Legion
             messages:        messages,
             system:          body[:system],
             routing:         { provider: provider, model: model },
-            tools:           tool_declarations,
+            tools:           all_tools,
             caller:          effective_caller,
             conversation_id: conversation_id,
             metadata:        { requested_tools: requested_tools },

data/lib/legion/llm/version.rb

@@ -2,6 +2,6 @@
 
 module Legion
   module LLM
-    VERSION = '0.6.15'
+    VERSION = '0.6.16'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: legion-llm
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.16
 platform: ruby
 authors:
 - Esity