swarm_sdk 2.7.12 → 2.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700ee5f9b81c58e030024d664a7c3e27db84c705c876493678c89371f803158a
-  data.tar.gz: b2a4e2d7dc72208bff64b9c8d5f72dbe9d2772ae5f2f61d8abf3973d5855867c
+  metadata.gz: 22ea4e05517149f4cb6f6f18e896e9493e9ed75f69e82bd6891a9b0b471e314e
+  data.tar.gz: 94f2f1b7c28fe626889aa4f1fbb611bb36ac4d73ab7de778f76e553538589cbb
 SHA512:
-  metadata.gz: 7e375f31f8419422c3b93065f0fa525d63ae063865b2dd62032ac42ff4e9f827111f5cf1dc13cc18e27e215e9e1a0924965791155f553d5af9261f53580680e4
-  data.tar.gz: f44a0e73852254048fe7219efed8db620bc41f4d274bfd938997ac5281a79c6cfa575e3be7631e404bbd84acfc3dd25649130a06fa10b85d4cac6a0099007d11
+  metadata.gz: 2360f50b71a7c2342f2301a8dc5362b0e92402f16bdaee19dc7932b395a33f37e12a385fe752b69411e481ed10418396b7245a5d61669f7d41d12b6f7d0c3f40
+  data.tar.gz: 076b1ca993b017aeabfe5e35daa08be81e4cd815e314b2e28b594f298ae2b5b430101a0c9ea01d5263689b21ad888e4fb17d06c4a59904aa38734308a21ad130

data/lib/swarm_sdk/agent/builder.rb

@@ -63,6 +63,7 @@ module SwarmSDK
         @shared_across_delegations = nil # nil = not set (will default to false in Definition)
         @streaming = nil # nil = not set (will use global config default)
         @thinking = nil # nil = not set (extended thinking disabled)
+        @disable_environment_info = nil # nil = not set (will default to false in Definition)
         @context_management_config = nil # Context management DSL hooks
       end
 
@@ -529,6 +530,29 @@ module SwarmSDK
         !@coding_agent.nil?
       end
 
+      # Disable environment info (date, platform, OS, working directory) in system prompt
+      #
+      # When true, omits the environment information section from the agent's system prompt.
+      # Defaults to false if not set.
+      #
+      # @param enabled [Boolean] Whether to disable environment info
+      # @return [void]
+      #
+      # @example
+      #   disable_environment_info true  # Omit environment info from prompt
+      def disable_environment_info(enabled)
+        @disable_environment_info = enabled
+      end
+
+      # Check if disable_environment_info has been explicitly set
+      #
+      # Used by Swarm::Builder to determine if all_agents disable_environment_info should apply.
+      #
+      # @return [Boolean] true if disable_environment_info was explicitly set
+      def disable_environment_info_set?
+        !@disable_environment_info.nil?
+      end
+
       # Check if parameters have been set
       #
       # Used by Swarm::Builder for merging all_agents parameters.
@@ -586,6 +610,7 @@ module SwarmSDK
         agent_config[:shared_across_delegations] = @shared_across_delegations unless @shared_across_delegations.nil?
         agent_config[:streaming] = @streaming unless @streaming.nil?
         agent_config[:thinking] = @thinking if @thinking
+        agent_config[:disable_environment_info] = @disable_environment_info unless @disable_environment_info.nil?
 
         # Convert DSL hooks to HookDefinition format
         agent_config[:hooks] = convert_hooks_to_definitions if @hooks.any?

data/lib/swarm_sdk/agent/chat.rb

@@ -526,17 +526,24 @@ module SwarmSDK
       #
       # This method:
       # 1. Serializes concurrent asks via @ask_semaphore
-      # 2. Adds CLEAN user message to history (no reminders)
-      # 3. Injects system reminders as ephemeral content (sent to LLM but not stored)
-      # 4. Triggers user_prompt hooks
-      # 5. Acquires global semaphore for LLM call
-      # 6. Delegates to RubyLLM::Chat for actual execution
+      # 2. Optionally clears conversation context (inside semaphore for safety)
+      # 3. Adds CLEAN user message to history (no reminders)
+      # 4. Injects system reminders as ephemeral content (sent to LLM but not stored)
+      # 5. Triggers user_prompt hooks
+      # 6. Acquires global semaphore for LLM call
+      # 7. Delegates to RubyLLM::Chat for actual execution
       #
       # @param prompt [String] User prompt
+      # @param clear_context [Boolean] When true, clears conversation history before
+      #   processing. Clearing happens inside the ask_semaphore, making it safe for
+      #   concurrent callers (e.g., parallel delegations to the same agent).
       # @param options [Hash] Additional options (source: for hooks)
       # @return [RubyLLM::Message] LLM response
-      def ask(prompt, **options)
+      def ask(prompt, clear_context: false, **options)
         @ask_semaphore.acquire do
+          # Clear inside semaphore so concurrent callers don't corrupt each other's messages
+          clear_conversation if clear_context
+
           if @turn_timeout
             execute_with_turn_timeout(prompt, options)
           else
@@ -651,57 +658,63 @@ module SwarmSDK
 
       # Execute ask without timeout (original ask implementation)
       def execute_ask(prompt, options)
-        is_first = first_message?
-
-        # Collect system reminders to inject as ephemeral content
-        reminders = collect_system_reminders(prompt, is_first)
+        @hook_swarm&.mark_agent_active(@agent_name, self)
 
-        # Trigger user_prompt hook (with clean prompt, not reminders)
-        source = options.delete(:source) || "user"
-        final_prompt = prompt
-        if @hook_executor
-          hook_result = trigger_user_prompt(prompt, source: source)
+        begin
+          is_first = first_message?
+
+          # Collect system reminders to inject as ephemeral content
+          reminders = collect_system_reminders(prompt, is_first)
+
+          # Trigger user_prompt hook (with clean prompt, not reminders)
+          source = options.delete(:source) || "user"
+          final_prompt = prompt
+          if @hook_executor
+            hook_result = trigger_user_prompt(prompt, source: source)
+
+            if hook_result[:halted]
+              return RubyLLM::Message.new(
+                role: :assistant,
+                content: hook_result[:halt_message],
+                model_id: model_id,
+              )
+            end
 
-          if hook_result[:halted]
-            return RubyLLM::Message.new(
-              role: :assistant,
-              content: hook_result[:halt_message],
-              model_id: model_id,
-            )
+            final_prompt = hook_result[:modified_prompt] if hook_result[:modified_prompt]
           end
 
-          final_prompt = hook_result[:modified_prompt] if hook_result[:modified_prompt]
-        end
-
-        # Add CLEAN user message to history (no reminders embedded)
-        @llm_chat.add_message(role: :user, content: final_prompt)
+          # Add CLEAN user message to history (no reminders embedded)
+          @llm_chat.add_message(role: :user, content: final_prompt)
 
-        # Track reminders as ephemeral content for this LLM call only
-        # They'll be injected by around_llm_request hook but not stored
-        reminders.each do |reminder|
-          @context_manager.add_ephemeral_reminder(reminder, messages_array: @llm_chat.messages)
-        end
-
-        # Execute complete() which handles tool loop and ephemeral injection
-        response = execute_with_global_semaphore do
-          catch(:finish_agent) do
-            catch(:finish_swarm) do
-              if @streaming_enabled
-                # Reset chunk type tracking for new streaming request
-                @last_chunk_type = nil
+          # Track reminders as ephemeral content for this LLM call only
+          # They'll be injected by around_llm_request hook but not stored
+          reminders.each do |reminder|
+            @context_manager.add_ephemeral_reminder(reminder, messages_array: @llm_chat.messages)
+          end
 
-                @llm_chat.complete(**options) do |chunk|
-                  emit_content_chunk(chunk)
+          # Execute complete() which handles tool loop and ephemeral injection
+          response = execute_with_global_semaphore do
+            catch(:finish_agent) do
+              catch(:finish_swarm) do
+                if @streaming_enabled
+                  # Reset chunk type tracking for new streaming request
+                  @last_chunk_type = nil
+
+                  @llm_chat.complete(**options) do |chunk|
+                    emit_content_chunk(chunk)
+                  end
+                else
+                  @llm_chat.complete(**options)
                 end
-              else
-                @llm_chat.complete(**options)
               end
             end
           end
-        end
 
-        # Handle finish markers from hooks
-        handle_finish_marker(response)
+          # Handle finish markers from hooks
+          handle_finish_marker(response)
+        ensure
+          @hook_swarm&.mark_agent_inactive(@agent_name)
+        end
       end
 
       # --- Tool Execution Hook ---

data/lib/swarm_sdk/agent/definition.rb

@@ -43,7 +43,8 @@ module SwarmSDK
         :plugin_configs,
         :shared_across_delegations,
         :streaming,
-        :thinking
+        :thinking,
+        :disable_environment_info
 
       attr_accessor :bypass_permissions, :max_concurrent_tools
 
@@ -118,6 +119,9 @@ module SwarmSDK
         # Extended thinking configuration (nil = disabled)
         @thinking = config[:thinking]
 
+        # When true, omits date/platform/OS/working directory from system prompts
+        @disable_environment_info = config.fetch(:disable_environment_info, false)
+
         # Build system prompt after directory and memory are set
         @system_prompt = build_full_system_prompt(config[:system_prompt])
 
@@ -201,6 +205,7 @@ module SwarmSDK
           hooks: @hooks,
           shared_across_delegations: @shared_across_delegations,
           streaming: @streaming,
+          disable_environment_info: @disable_environment_info,
           # Permissions are core SDK functionality (not plugin-specific)
           default_permissions: @default_permissions,
           permissions: @agent_permissions,
@@ -301,6 +306,7 @@ module SwarmSDK
           disable_default_tools: @disable_default_tools,
           directory: @directory,
           definition: self,
+          disable_environment_info: @disable_environment_info,
         )
       end
 
@@ -394,6 +400,7 @@ module SwarmSDK
           :shared_across_delegations,
           :streaming,
           :directories,
+          :disable_environment_info,
         ]
 
         config.reject { |k, _| standard_keys.include?(k.to_sym) }

data/lib/swarm_sdk/agent/llm_instrumentation_middleware.rb

@@ -82,6 +82,7 @@ module SwarmSDK
       def emit_request_event(env, timestamp)
         request_data = {
           provider: @provider_name,
+          url: env.url.to_s,
           body: parse_body(env.body),
           timestamp: timestamp.utc.iso8601,
         }

data/lib/swarm_sdk/agent/system_prompt_builder.rb

@@ -28,24 +28,29 @@ module SwarmSDK
         # @param disable_default_tools [Boolean, Array, nil] Default tools disable configuration
         # @param directory [String] Agent's working directory
         # @param definition [Definition] Full definition for plugin contributions
+        # @param disable_environment_info [Boolean] Whether to omit environment info from prompt
         # @return [String] Complete system prompt
-        def build(custom_prompt:, coding_agent:, disable_default_tools:, directory:, definition:)
+        def build(custom_prompt:, coding_agent:, disable_default_tools:, directory:, definition:,
+          disable_environment_info: false)
           new(
             custom_prompt: custom_prompt,
             coding_agent: coding_agent,
             disable_default_tools: disable_default_tools,
             directory: directory,
             definition: definition,
+            disable_environment_info: disable_environment_info,
           ).build
         end
       end
 
-      def initialize(custom_prompt:, coding_agent:, disable_default_tools:, directory:, definition:)
+      def initialize(custom_prompt:, coding_agent:, disable_default_tools:, directory:, definition:,
+        disable_environment_info: false)
         @custom_prompt = custom_prompt
         @coding_agent = coding_agent
         @disable_default_tools = disable_default_tools
         @directory = directory
         @definition = definition
+        @disable_environment_info = disable_environment_info
       end
 
       def build
@@ -80,7 +85,11 @@ module SwarmSDK
         non_coding_base = render_non_coding_base_prompt
 
         if @custom_prompt && !@custom_prompt.strip.empty?
-          "#{non_coding_base}\n\n#{@custom_prompt}"
+          if non_coding_base.empty?
+            @custom_prompt.to_s
+          else
+            "#{non_coding_base}\n\n#{@custom_prompt}"
+          end
         else
           non_coding_base
         end
@@ -91,6 +100,7 @@ module SwarmSDK
       end
 
       def render_base_system_prompt
+        disable_environment_info = @disable_environment_info
         cwd = @directory || Dir.pwd
         platform = RUBY_PLATFORM
         os_version = begin
@@ -105,6 +115,8 @@ module SwarmSDK
       end
 
       def render_non_coding_base_prompt
+        return "" if @disable_environment_info
+
         cwd = @directory || Dir.pwd
         platform = RUBY_PLATFORM
         os_version = begin

data/lib/swarm_sdk/builders/base_builder.rb

@@ -265,6 +265,7 @@ module SwarmSDK
         builder.parameters(config[:parameters]) if config[:parameters]
         builder.headers(config[:headers]) if config[:headers]
         builder.coding_agent(config[:coding_agent]) unless config[:coding_agent].nil?
+        builder.disable_environment_info(config[:disable_environment_info]) unless config[:disable_environment_info].nil?
         builder.bypass_permissions(config[:bypass_permissions]) if config[:bypass_permissions]
         builder.disable_default_tools(config[:disable_default_tools]) unless config[:disable_default_tools].nil?
 
@@ -451,6 +452,10 @@ module SwarmSDK
           agent_builder.streaming(all_agents_hash[:streaming])
         end
 
+        if !all_agents_hash[:disable_environment_info].nil? && !agent_builder.disable_environment_info_set?
+          agent_builder.disable_environment_info(all_agents_hash[:disable_environment_info])
+        end
+
         if all_agents_hash[:thinking] && !agent_builder.thinking_set?
           agent_builder.thinking(**all_agents_hash[:thinking])
         end

data/lib/swarm_sdk/concerns/cleanupable.rb

@@ -31,6 +31,9 @@ module SwarmSDK
 
         @mcp_clients.clear
 
+        # Shutdown sub-swarms if registry exists
+        @swarm_registry&.shutdown_all
+
         # Clear delegation instances
         delegation_instances_hash&.clear
       end

data/lib/swarm_sdk/config.rb

@@ -105,6 +105,7 @@ module SwarmSDK
       allow_filesystem_tools: ["SWARM_SDK_ALLOW_FILESYSTEM_TOOLS", true],
       env_interpolation: ["SWARM_SDK_ENV_INTERPOLATION", true],
       streaming: ["SWARM_SDK_STREAMING", true],
+      mcp_ssl_verify: ["SWARM_SDK_MCP_SSL_VERIFY", true],
     }.freeze
 
     class << self
@@ -345,7 +346,7 @@ module SwarmSDK
     # @return [Integer, Float, Boolean, String] The parsed value
     def parse_env_value(value, key)
       case key
-      when :allow_filesystem_tools, :env_interpolation, :streaming
+      when :allow_filesystem_tools, :env_interpolation, :streaming, :mcp_ssl_verify
         # Convert string to boolean
         case value.to_s.downcase
         when "true", "yes", "1", "on", "enabled"

data/lib/swarm_sdk/configuration/translator.rb

@@ -100,6 +100,7 @@ module SwarmSDK
           coding_agent(all_agents_cfg[:coding_agent]) unless all_agents_cfg[:coding_agent].nil?
           disable_default_tools(all_agents_cfg[:disable_default_tools]) unless all_agents_cfg[:disable_default_tools].nil?
           streaming(all_agents_cfg[:streaming]) unless all_agents_cfg[:streaming].nil?
+          disable_environment_info(all_agents_cfg[:disable_environment_info]) unless all_agents_cfg[:disable_environment_info].nil?
           thinking(**all_agents_cfg[:thinking]) if all_agents_cfg[:thinking]
 
           if all_agents_hks.any?
@@ -165,6 +166,7 @@ module SwarmSDK
           disable_default_tools(config[:disable_default_tools]) unless config[:disable_default_tools].nil?
           shared_across_delegations(config[:shared_across_delegations]) unless config[:shared_across_delegations].nil?
           streaming(config[:streaming]) unless config[:streaming].nil?
+          disable_environment_info(config[:disable_environment_info]) unless config[:disable_environment_info].nil?
           thinking(**config[:thinking]) if config[:thinking]
 
           if config[:tools]&.any?

data/lib/swarm_sdk/observer/manager.rb

@@ -75,6 +75,18 @@ module SwarmSDK
         end
       end
 
+      # Stop all observer tasks immediately
+      #
+      # Interrupts in-flight observer LLM calls by stopping the barrier.
+      # Called during swarm interruption instead of wait_for_completion.
+      #
+      # @return [void]
+      def stop
+        @barrier&.stop
+      rescue StandardError => e
+        RubyLLM.logger.debug("SwarmSDK: Error stopping observer barrier: #{e.message}")
+      end
+
       # Cleanup all subscriptions
       #
       # Unsubscribes from LogCollector to prevent memory leaks.

data/lib/swarm_sdk/prompts/base_system_prompt.md.erb

@@ -90,6 +90,7 @@ NEVER commit changes unless the user explicitly asks you to. It is VERY IMPORTAN
 You MUST answer concisely with fewer than 4 lines of text (not including tool use or code generation), unless user asks for detail.
 
 
+<% unless disable_environment_info %>
 # Today's date
 
 <today-date>
@@ -104,6 +105,7 @@ Working directory: <%= cwd %>
 Platform: <%= platform %>
 OS Version: <%= os_version %>
 </env>
+<% end %>
 
 IMPORTANT: Assist with defensive security tasks only. Refuse to create, modify, or improve code that may be used maliciously. Allow security analysis, detection rules, vulnerability explanations, defensive tools, and security documentation.
 

data/lib/swarm_sdk/result.rb

@@ -23,6 +23,35 @@ module SwarmSDK
       !success?
     end
 
+    # Check if execution was interrupted via swarm.stop
+    #
+    # @return [Boolean] true if execution was interrupted
+    #
+    # @example
+    #   result = swarm.execute("Build auth")
+    #   result.interrupted?  # => false
+    #
+    #   # After calling swarm.stop during execution:
+    #   result.interrupted?  # => true
+    def interrupted?
+      @metadata[:interrupted] == true
+    end
+
+    # Get the reason execution finished
+    #
+    # Possible values:
+    # - "finished" - Normal completion
+    # - "interrupted" - Stopped via swarm.stop
+    # - "error" - Execution failed with an error
+    #
+    # @return [String] The finish reason
+    #
+    # @example
+    #   result.finish_reason  # => "finished"
+    def finish_reason
+      @metadata[:finish_reason] || (success? ? "finished" : "error")
+    end
+
     # Calculate total cost from logs
     #
     # Delegates to total_cost for consistency. This attribute is calculated

data/lib/swarm_sdk/ruby_llm_patches/chat_callbacks_patch.rb

@@ -153,30 +153,34 @@ module RubyLLM
         end
       end
 
-      # Override complete to use emit() and support around_llm_request hook
-      # Follows fork pattern: tool call handling wraps message addition
+      # Override complete to use emit() and support around_llm_request hook.
+      # Uses a trampoline loop instead of mutual recursion with handle_tool_calls
+      # to avoid stack growth during multi-round tool-call conversations.
       def complete(&block)
-        # Execute LLM request (potentially wrapped by around_llm_request hook)
-        response = execute_llm_request(&block)
+        loop do
+          response = execute_llm_request(&block)
 
-        emit(:new_message) unless block_given?
+          emit(:new_message) unless block_given?
 
-        if @schema && response.content.is_a?(String)
-          begin
-            response.content = JSON.parse(response.content)
-          rescue JSON::ParserError
-            # If parsing fails, keep content as string
+          if @schema && response.content.is_a?(String)
+            begin
+              response.content = JSON.parse(response.content)
+            rescue JSON::ParserError
+              # If parsing fails, keep content as string
+            end
           end
-        end
 
-        add_message(response)
-        emit(:end_message, response)
-        if response.tool_call?
-          # For tool calls: add message, emit end_message, then handle tools
-          handle_tool_calls(response, &block)
-        else
-          # For final responses: add message and emit end_message
-          response
+          add_message(response)
+          emit(:end_message, response)
+
+          if response.tool_call?
+            halt_result = handle_tool_calls(response, &block)
+            return halt_result if halt_result
+
+            # Loop continues: next LLM call with zero stack growth
+          else
+            return response
+          end
         end
       end
 
@@ -238,8 +242,9 @@ module RubyLLM
         end
       end
 
-      # Override handle_tool_calls to use emit and support around_tool_execution hook
-      def handle_tool_calls(response, &block)
+      # Execute tool calls and return halt result (or nil to continue the loop).
+      # Does NOT recurse back into complete() — the trampoline loop handles that.
+      def handle_tool_calls(response, &_block)
         halt_result = nil
 
         response.tool_calls.each_value do |tool_call|
@@ -259,7 +264,7 @@ module RubyLLM
           halt_result = result if result.is_a?(Tool::Halt)
         end
 
-        halt_result || complete(&block)
+        halt_result
       end
 
       # Execute tool with around_tool_execution hook if set

data/lib/swarm_sdk/ruby_llm_patches/configuration_patch.rb

@@ -3,6 +3,7 @@
 # Extends RubyLLM::Configuration with additional options:
 # - anthropic_api_base: Configurable Anthropic API base URL
 # - read_timeout, open_timeout, write_timeout: Granular timeout configuration
+# - Fixes Anthropic completion_url leading slash that breaks proxy base URLs
 #
 # Fork Reference: Commits da6144b, 3daa4fb
 
@@ -29,13 +30,25 @@ module RubyLLM
     end
   end
 
-  # Patch Anthropic provider to use configurable base URL
+  # Patch Anthropic provider to use configurable base URL and fix completion_url
   module Providers
     class Anthropic
       # Override api_base to use configurable base URL
       def api_base
         @config.anthropic_api_base || "https://api.anthropic.com"
       end
+
+      # Fix completion_url to use relative path (no leading slash).
+      # The leading slash causes Faraday to discard the base URL path component,
+      # breaking proxy configurations where api_base includes a path segment
+      # (e.g., https://proxy.dev/apis/anthropic/v1/messages → https://proxy.dev/v1/messages).
+      # stream_url delegates to completion_url, so this fixes both sync and streaming.
+      # Can be removed once RubyLLM releases a version including upstream fix (commit da6144b).
+      module Chat
+        def completion_url
+          "v1/messages"
+        end
+      end
     end
   end
 end

data/lib/swarm_sdk/ruby_llm_patches/init.rb

@@ -39,3 +39,6 @@ require_relative "message_management_patch"
 
 # 7. Responses API patch (depends on configuration, uses error classes)
 require_relative "responses_api_patch"
+
+# 8. MCP SSL patch (configures SSL for HTTPX connections in ruby_llm-mcp)
+require_relative "mcp_ssl_patch"