swarm_sdk 2.1.3 → 2.3.0

data/lib/swarm_sdk.rb

@@ -15,6 +15,28 @@ require "yaml"
 require "async"
 require "async/semaphore"
 require "ruby_llm"
+require "ruby_llm/mcp"
+
+# Patch ruby_llm-mcp's Zeitwerk loader to ignore railtie.rb when Rails is not present
+# This prevents NameError when eager loading outside of Rails applications
+# Can be removed once https://github.com/parruda/ruby_llm-mcp/issues/XXX is fixed
+unless defined?(Rails)
+  require "zeitwerk"
+  mcp_loader = nil
+  Zeitwerk::Registry.loaders.each { |l| mcp_loader = l if l.tag == "RubyLLM-mcp" }
+  if mcp_loader
+    mcp_gem_dir = Gem.loaded_specs["ruby_llm-mcp"]&.gem_dir
+    if mcp_gem_dir
+      railtie_path = File.join(mcp_gem_dir, "lib", "ruby_llm", "mcp", "railtie.rb")
+      mcp_loader.ignore(railtie_path)
+    end
+  end
+end
+
+# Configure Faraday to use async-http adapter by default
+# This ensures HTTP requests are fiber-aware and don't block the Async scheduler
+# when SwarmSDK executes LLM requests within Async/Sync blocks
+require "async/http/faraday/default"
 
 require_relative "swarm_sdk/version"
 
@@ -25,6 +47,8 @@ loader.push_dir("#{__dir__}/swarm_sdk", namespace: SwarmSDK)
 loader.inflector = Zeitwerk::GemInflector.new(__FILE__)
 loader.inflector.inflect(
   "cli" => "CLI",
+  "llm_instrumentation_middleware" => "LLMInstrumentationMiddleware",
+  "mcp" => "MCP",
   "openai_with_responses" => "OpenAIWithResponses",
 )
 loader.setup
@@ -42,9 +66,18 @@ module SwarmSDK
     # Settings for SwarmSDK (global configuration)
     attr_accessor :settings
 
-    # Main entry point for DSL
-    def build(&block)
-      Swarm::Builder.build(&block)
+    # Main entry point for DSL - builds simple multi-agent swarms
+    #
+    # @return [Swarm] Always returns a Swarm instance
+    def build(allow_filesystem_tools: nil, &block)
+      Swarm::Builder.build(allow_filesystem_tools: allow_filesystem_tools, &block)
+    end
+
+    # Entry point for building multi-stage workflows
+    #
+    # @return [Workflow] Always returns a Workflow instance
+    def workflow(allow_filesystem_tools: nil, &block)
+      Workflow::Builder.build(allow_filesystem_tools: allow_filesystem_tools, &block)
     end
 
     # Validate YAML configuration without creating a swarm
@@ -84,6 +117,10 @@ module SwarmSDK
       begin
         config = Configuration.new(yaml_content, base_dir: base_dir)
         config.load_and_validate
+
+        # Build swarm to trigger DSL validation
+        # This catches errors from Agent::Definition, Builder, etc.
+        config.to_swarm
       rescue ConfigurationError, CircularDependencyError => e
         errors << parse_configuration_error(e)
       rescue StandardError => e
@@ -142,7 +179,7 @@ module SwarmSDK
     #
     # @param yaml_content [String] YAML configuration content
     # @param base_dir [String, Pathname] Base directory for resolving agent file paths (default: Dir.pwd)
-    # @return [Swarm, NodeOrchestrator] Configured swarm or orchestrator instance
+    # @return [Swarm, Workflow] Configured swarm or workflow instance
     # @raise [ConfigurationError] If YAML is invalid or configuration is incorrect
     #
     # @example Load from YAML string
@@ -164,10 +201,10 @@ module SwarmSDK
     # @example Load with default base_dir (Dir.pwd)
     #   yaml = File.read("config.yml")
     #   swarm = SwarmSDK.load(yaml)  # base_dir defaults to Dir.pwd
-    def load(yaml_content, base_dir: Dir.pwd)
+    def load(yaml_content, base_dir: Dir.pwd, allow_filesystem_tools: nil)
       config = Configuration.new(yaml_content, base_dir: base_dir)
       config.load_and_validate
-      swarm = config.to_swarm
+      swarm = config.to_swarm(allow_filesystem_tools: allow_filesystem_tools)
 
       # Apply hooks if any are configured (YAML-only feature)
       if hooks_configured?(config)
@@ -187,7 +224,7 @@ module SwarmSDK
     # loading swarms from configuration files.
     #
     # @param path [String, Pathname] Path to YAML configuration file
-    # @return [Swarm, NodeOrchestrator] Configured swarm or orchestrator instance
+    # @return [Swarm, Workflow] Configured swarm or workflow instance
     # @raise [ConfigurationError] If file not found or configuration invalid
     #
     # @example
@@ -196,9 +233,9 @@ module SwarmSDK
     #
     # @example With absolute path
     #   swarm = SwarmSDK.load_file("/absolute/path/config.yml")
-    def load_file(path)
+    def load_file(path, allow_filesystem_tools: nil)
       config = Configuration.load_file(path)
-      swarm = config.to_swarm
+      swarm = config.to_swarm(allow_filesystem_tools: allow_filesystem_tools)
 
       # Apply hooks if any are configured (YAML-only feature)
       if hooks_configured?(config)
@@ -235,7 +272,7 @@ module SwarmSDK
     def hooks_configured?(config)
       config.swarm_hooks.any? ||
         config.all_agents_hooks.any? ||
-        config.agents.any? { |_, agent_def| agent_def.hooks&.any? }
+        config.agents.any? { |_, agent_config| agent_config[:hooks]&.any? }
     end
 
     # Parse configuration error and extract structured information
@@ -323,7 +360,7 @@ module SwarmSDK
           field: "swarm.lead",
         )
 
-      # Unknown agent in connections
+      # Unknown agent in connections (old format)
       when /Agent '([^']+)' has connection to unknown agent '([^']+)'/i
         agent_name = Regexp.last_match(1)
         error_hash.merge!(
@@ -332,6 +369,15 @@ module SwarmSDK
           agent: agent_name,
         )
 
+      # Unknown agent in connections (new format with composable swarms)
+      when /Agent '([^']+)' delegates to unknown target '([^']+)'/i
+        agent_name = Regexp.last_match(1)
+        error_hash.merge!(
+          type: :invalid_reference,
+          field: "swarm.agents.#{agent_name}.delegates_to",
+          agent: agent_name,
+        )
+
       # Circular dependency
       when /Circular dependency detected/i
         error_hash.merge!(
@@ -397,17 +443,33 @@ module SwarmSDK
     # WebFetch tool LLM processing configuration
     attr_accessor :webfetch_provider, :webfetch_model, :webfetch_base_url, :webfetch_max_tokens
 
+    # Filesystem tools control
+    attr_accessor :allow_filesystem_tools
+
     def initialize
       @webfetch_provider = nil
       @webfetch_model = nil
       @webfetch_base_url = nil
       @webfetch_max_tokens = 4096
+      @allow_filesystem_tools = parse_env_bool("SWARM_SDK_ALLOW_FILESYSTEM_TOOLS", default: true)
     end
 
     # Check if WebFetch LLM processing is enabled
     def webfetch_llm_enabled?
       !@webfetch_provider.nil? && !@webfetch_model.nil?
     end
+
+    private
+
+    def parse_env_bool(key, default:)
+      return default unless ENV.key?(key)
+
+      value = ENV[key].to_s.downcase
+      return true if ["true", "yes", "1", "on", "enabled"].include?(value)
+      return false if ["false", "no", "0", "off", "disabled"].include?(value)
+
+      default
+    end
   end
 
   # Initialize default settings

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swarm_sdk
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Paulo Arruda
@@ -24,33 +24,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ruby_llm
+  name: async-http-faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.22'
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: ruby_llm-mcp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: ruby_llm_swarm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -81,18 +109,36 @@ files:
 - lib/swarm_sdk/agent/RETRY_LOGIC.md
 - lib/swarm_sdk/agent/builder.rb
 - lib/swarm_sdk/agent/chat.rb
-- lib/swarm_sdk/agent/chat/context_tracker.rb
-- lib/swarm_sdk/agent/chat/hook_integration.rb
-- lib/swarm_sdk/agent/chat/logging_helpers.rb
-- lib/swarm_sdk/agent/chat/system_reminder_injector.rb
+- lib/swarm_sdk/agent/chat_helpers/context_tracker.rb
+- lib/swarm_sdk/agent/chat_helpers/event_emitter.rb
+- lib/swarm_sdk/agent/chat_helpers/hook_integration.rb
+- lib/swarm_sdk/agent/chat_helpers/instrumentation.rb
+- lib/swarm_sdk/agent/chat_helpers/llm_configuration.rb
+- lib/swarm_sdk/agent/chat_helpers/logging_helpers.rb
+- lib/swarm_sdk/agent/chat_helpers/serialization.rb
+- lib/swarm_sdk/agent/chat_helpers/system_reminder_injector.rb
+- lib/swarm_sdk/agent/chat_helpers/system_reminders.rb
+- lib/swarm_sdk/agent/chat_helpers/token_tracking.rb
 - lib/swarm_sdk/agent/context.rb
 - lib/swarm_sdk/agent/context_manager.rb
 - lib/swarm_sdk/agent/definition.rb
+- lib/swarm_sdk/agent/llm_instrumentation_middleware.rb
+- lib/swarm_sdk/agent/system_prompt_builder.rb
+- lib/swarm_sdk/builders/base_builder.rb
 - lib/swarm_sdk/claude_code_agent_adapter.rb
+- lib/swarm_sdk/concerns/cleanupable.rb
+- lib/swarm_sdk/concerns/snapshotable.rb
+- lib/swarm_sdk/concerns/validatable.rb
 - lib/swarm_sdk/configuration.rb
+- lib/swarm_sdk/configuration/parser.rb
+- lib/swarm_sdk/configuration/translator.rb
 - lib/swarm_sdk/context_compactor.rb
 - lib/swarm_sdk/context_compactor/metrics.rb
 - lib/swarm_sdk/context_compactor/token_counter.rb
+- lib/swarm_sdk/context_management/builder.rb
+- lib/swarm_sdk/context_management/context.rb
+- lib/swarm_sdk/defaults.rb
+- lib/swarm_sdk/events_to_messages.rb
 - lib/swarm_sdk/hooks/adapter.rb
 - lib/swarm_sdk/hooks/context.rb
 - lib/swarm_sdk/hooks/definition.rb
@@ -106,15 +152,14 @@ files:
 - lib/swarm_sdk/log_collector.rb
 - lib/swarm_sdk/log_stream.rb
 - lib/swarm_sdk/markdown_parser.rb
-- lib/swarm_sdk/mcp.rb
 - lib/swarm_sdk/model_aliases.json
 - lib/swarm_sdk/models.json
 - lib/swarm_sdk/models.rb
-- lib/swarm_sdk/node/agent_config.rb
-- lib/swarm_sdk/node/builder.rb
-- lib/swarm_sdk/node/transformer_executor.rb
 - lib/swarm_sdk/node_context.rb
-- lib/swarm_sdk/node_orchestrator.rb
+- lib/swarm_sdk/observer/builder.rb
+- lib/swarm_sdk/observer/config.rb
+- lib/swarm_sdk/observer/manager.rb
+- lib/swarm_sdk/patterns/agent_observer.rb
 - lib/swarm_sdk/permissions/config.rb
 - lib/swarm_sdk/permissions/error_formatter.rb
 - lib/swarm_sdk/permissions/path_matcher.rb
@@ -122,15 +167,26 @@ files:
 - lib/swarm_sdk/permissions_builder.rb
 - lib/swarm_sdk/plugin.rb
 - lib/swarm_sdk/plugin_registry.rb
+- lib/swarm_sdk/proc_helpers.rb
 - lib/swarm_sdk/prompts/base_system_prompt.md.erb
-- lib/swarm_sdk/providers/openai_with_responses.rb
+- lib/swarm_sdk/restore_result.rb
 - lib/swarm_sdk/result.rb
+- lib/swarm_sdk/snapshot.rb
+- lib/swarm_sdk/snapshot_from_events.rb
+- lib/swarm_sdk/state_restorer.rb
+- lib/swarm_sdk/state_snapshot.rb
 - lib/swarm_sdk/swarm.rb
 - lib/swarm_sdk/swarm/agent_initializer.rb
 - lib/swarm_sdk/swarm/all_agents_builder.rb
 - lib/swarm_sdk/swarm/builder.rb
+- lib/swarm_sdk/swarm/executor.rb
+- lib/swarm_sdk/swarm/hook_triggers.rb
+- lib/swarm_sdk/swarm/logging_callbacks.rb
 - lib/swarm_sdk/swarm/mcp_configurator.rb
+- lib/swarm_sdk/swarm/swarm_registry_builder.rb
 - lib/swarm_sdk/swarm/tool_configurator.rb
+- lib/swarm_sdk/swarm_loader.rb
+- lib/swarm_sdk/swarm_registry.rb
 - lib/swarm_sdk/tools/bash.rb
 - lib/swarm_sdk/tools/clock.rb
 - lib/swarm_sdk/tools/delegate.rb
@@ -161,7 +217,14 @@ files:
 - lib/swarm_sdk/tools/web_fetch.rb
 - lib/swarm_sdk/tools/write.rb
 - lib/swarm_sdk/utils.rb
+- lib/swarm_sdk/validation_result.rb
 - lib/swarm_sdk/version.rb
+- lib/swarm_sdk/workflow.rb
+- lib/swarm_sdk/workflow/agent_config.rb
+- lib/swarm_sdk/workflow/builder.rb
+- lib/swarm_sdk/workflow/executor.rb
+- lib/swarm_sdk/workflow/node_builder.rb
+- lib/swarm_sdk/workflow/transformer_executor.rb
 homepage: https://github.com/parruda/claude-swarm
 licenses:
 - MIT

data/lib/swarm_sdk/mcp.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module SwarmSDK
-  module MCP
-    class << self
-      # Lazy load ruby_llm-mcp only when MCP servers are used
-      def lazy_load
-        return if @loaded
-
-        require "ruby_llm/mcp"
-
-        @loaded = true
-      end
-    end
-  end
-end