swarm_sdk 2.7.6 → 2.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5806264bb99cea0a71727c89c5839ff3027c17cd725e4261244e14ae9079f513
-  data.tar.gz: f3d489dd1d6045dec6b97b499b2d6e27d78440d1b2289a19c2f3bedb27440c8d
+  metadata.gz: b83fd113813e0667b02d12c5ef6b9f4d47c134afa0665e2b6e482a6c9d3dacd7
+  data.tar.gz: 8a758e06817af7690c21fc446597b0e1a91b876643d20a4a111a62bc953d3d5e
 SHA512:
-  metadata.gz: a37edf046435540ba32aa47b5552ef48e1c599c69a0bf0540ccfa2199a01947006ffe98eb8df1848175e11b673bebbf787156815dc4e5ea9403ab0db984997bd
-  data.tar.gz: 2ca616d67f41b19fe596d86fdd36aa6255cb314480c34253aacb7d8276196fd2e2bbd4fb3057b42faec5b000474754df7cce56cddbeb26fcc3301e6fa2a89fcb
+  metadata.gz: 5bfcfaf82ca105e6b1e1f04e009c703b641c25af6797ccd72c945a0c8dbbfbe60a0d783fc9e8d43322bbefac95b16123c4e7232c4ac9e1850a770d1120568344
+  data.tar.gz: 0aa16f8d6ebe0fd2acb4cb52baba570000c82c4607d015d3a4569d671f9743cb1199edd80953002b8dc0fb673fb464ebfc2d5d0c645f3afb50258c7451281304

data/lib/swarm_sdk/swarm/mcp_configurator.rb

@@ -82,6 +82,7 @@ module SwarmSDK
               stub = Tools::McpToolStub.new(
                 client: client,
                 name: tool_name.to_s,
+                server_name: server_config[:name],
               )
               chat.tool_registry.register(
                 stub,

data/lib/swarm_sdk/tools/mcp_tool_stub.rb

@@ -33,22 +33,24 @@ module SwarmSDK
     class McpToolStub < Base
       removable true # MCP tools can be controlled by skills
 
-      attr_reader :name, :client
+      attr_reader :name, :client, :server_name
 
       # Create a new MCP tool stub
       #
       # @param client [RubyLLM::MCP::Client] MCP client instance
       # @param name [String] Tool name
+      # @param server_name [String, nil] MCP server name for error context
       # @param description [String, nil] Tool description (optional, fetched if nil)
       # @param schema [Hash, nil] Tool input schema (optional, fetched if nil)
       #
       # @example Minimal stub (lazy description + schema)
-      #   McpToolStub.new(client: client, name: "search")
+      #   McpToolStub.new(client: client, name: "search", server_name: "codebase")
       #
       # @example With description (lazy schema only)
       #   McpToolStub.new(
       #     client: client,
       #     name: "search",
+      #     server_name: "codebase",
       #     description: "Search the codebase"
       #   )
       #
@@ -56,14 +58,16 @@ module SwarmSDK
       #   McpToolStub.new(
       #     client: client,
       #     name: "search",
+      #     server_name: "codebase",
       #     description: "Search the codebase",
       #     schema: { type: "object", properties: {...} }
       #   )
-      def initialize(client:, name:, description: nil, schema: nil)
+      def initialize(client:, name:, server_name: nil, description: nil, schema: nil)
         super()
         @client = client
         @name = name
         @mcp_name = name
+        @server_name = server_name || "unknown"
         @description = description || "MCP tool: #{name}"
         @input_schema = schema
         @schema_loaded = !schema.nil?
@@ -93,6 +97,9 @@ module SwarmSDK
       #
       # @param params [Hash] Tool parameters
       # @return [String, Hash] Tool result content or error hash
+      # @raise [MCPTimeoutError] When the MCP server times out
+      # @raise [MCPTransportError] When there's a transport-level error
+      # @raise [MCPError] When any other MCP error occurs
       def execute(**params)
         # Use client.call_tool (client has internal coordinator)
         result = @client.call_tool(
@@ -102,6 +109,23 @@ module SwarmSDK
 
         # client.call_tool returns the result content directly
         result
+      rescue RubyLLM::MCP::Errors::TimeoutError => e
+        raise MCPTimeoutError, format_mcp_error(
+          "MCP request timed out",
+          original_message: e.message,
+          request_id: e.request_id,
+        )
+      rescue RubyLLM::MCP::Errors::TransportError => e
+        raise MCPTransportError, format_mcp_error(
+          "MCP transport error",
+          original_message: e.message,
+          code: e.code,
+        )
+      rescue RubyLLM::MCP::Errors::BaseError => e
+        raise MCPError, format_mcp_error(
+          "MCP error",
+          original_message: e.message,
+        )
       end
 
       private
@@ -112,6 +136,9 @@ module SwarmSDK
       # Multiple concurrent fibers will only trigger one fetch.
       #
       # @return [void]
+      # @raise [MCPTimeoutError] When the MCP server times out during schema fetch
+      # @raise [MCPTransportError] When there's a transport-level error
+      # @raise [MCPError] When any other MCP error occurs
       def ensure_schema_loaded!
         return if @schema_loaded
 
@@ -131,6 +158,40 @@ module SwarmSDK
 
           @schema_loaded = true
         end
+      rescue RubyLLM::MCP::Errors::TimeoutError => e
+        raise MCPTimeoutError, format_mcp_error(
+          "MCP schema fetch timed out",
+          original_message: e.message,
+          request_id: e.request_id,
+        )
+      rescue RubyLLM::MCP::Errors::TransportError => e
+        raise MCPTransportError, format_mcp_error(
+          "MCP transport error during schema fetch",
+          original_message: e.message,
+          code: e.code,
+        )
+      rescue RubyLLM::MCP::Errors::BaseError => e
+        raise MCPError, format_mcp_error(
+          "MCP error during schema fetch",
+          original_message: e.message,
+        )
+      end
+
+      # Format MCP error message with contextual information
+      #
+      # @param prefix [String] Error message prefix
+      # @param original_message [String] Original error message from RubyLLM::MCP
+      # @param request_id [String, nil] MCP request ID (for timeout errors)
+      # @param code [Integer, nil] HTTP status code (for transport errors)
+      # @return [String] Formatted error message with full context
+      def format_mcp_error(prefix, original_message:, request_id: nil, code: nil)
+        parts = [prefix]
+        parts << "[server: #{@server_name}]"
+        parts << "[tool: #{@mcp_name}]"
+        parts << "[request_id: #{request_id}]" if request_id
+        parts << "[code: #{code}]" if code
+        parts << "- #{original_message}"
+        parts.join(" ")
       end
     end
   end

data/lib/swarm_sdk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SwarmSDK
-  VERSION = "2.7.6"
+  VERSION = "2.7.7"
 end

data/lib/swarm_sdk.rb

@@ -71,6 +71,15 @@ module SwarmSDK
   # Raised when agent turn exceeds turn_timeout
   class TurnTimeoutError < TimeoutError; end
 
+  # Base class for MCP-related errors (provides context about server/tool)
+  class MCPError < Error; end
+
+  # Raised when MCP request times out
+  class MCPTimeoutError < MCPError; end
+
+  # Raised when MCP transport fails (connection, HTTP errors)
+  class MCPTransportError < MCPError; end
+
   class << self
     # Get the global configuration instance
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swarm_sdk
 version: !ruby/object:Gem::Version
-  version: 2.7.6
+  version: 2.7.7
 platform: ruby
 authors:
 - Paulo Arruda