claude_swarm 1.0.8 → 1.0.10

data/lib/claude_swarm/mcp_generator.rb

@@ -2,6 +2,12 @@
 
 module ClaudeSwarm
   class McpGenerator
+    CLAUDE_MCP_SERVER_CONFIG = {
+      "type" => "stdio",
+      "command" => "claude",
+      "args" => ["mcp", "serve"],
+    }.freeze
+
     def initialize(configuration, vibe: false, restore_session_path: nil)
       @config = configuration
       @vibe = vibe
@@ -65,7 +71,7 @@ module ClaudeSwarm
       end
 
       # Add Claude tools MCP server for OpenAI instances
-      mcp_servers["claude_tools"] = build_claude_tools_mcp_config if instance[:provider] == "openai"
+      mcp_servers["claude_tools"] = CLAUDE_MCP_SERVER_CONFIG.dup if instance[:provider] == "openai"
 
       config = {
         "instance_id" => @instance_ids[name],
@@ -96,25 +102,6 @@ module ClaudeSwarm
       end
     end
 
-    def build_claude_tools_mcp_config
-      # Build environment for claude mcp serve by excluding Ruby/Bundler-specific variables
-      # This preserves all system variables while removing Ruby contamination
-      clean_env = ENV.to_h.reject do |key, _|
-        key.start_with?("BUNDLE_") ||
-          key.start_with?("RUBY") ||
-          key.start_with?("GEM_") ||
-          key == "RUBYOPT" ||
-          key == "RUBYLIB"
-      end
-
-      {
-        "type" => "stdio",
-        "command" => "claude",
-        "args" => ["mcp", "serve"],
-        "env" => clean_env,
-      }
-    end
-
     def build_instance_mcp_config(name, instance, calling_instance:, calling_instance_id:)
       # Get the path to the claude-swarm executable
       exe_path = "claude-swarm"
@@ -174,6 +161,7 @@ module ClaudeSwarm
           args.push("--api-version", instance[:api_version]) if instance[:api_version]
           args.push("--openai-token-env", instance[:openai_token_env]) if instance[:openai_token_env]
           args.push("--base-url", instance[:base_url]) if instance[:base_url]
+          args.push("--zdr", instance[:zdr].to_s) if instance.key?(:zdr)
         end
       end
 

data/lib/claude_swarm/openai/chat_completion.rb

@@ -5,7 +5,7 @@ module ClaudeSwarm
     class ChatCompletion
       MAX_TURNS_WITH_TOOLS = 100_000 # virtually infinite
 
-      def initialize(openai_client:, mcp_client:, available_tools:, executor:, instance_name:, model:, temperature: nil, reasoning_effort: nil)
+      def initialize(openai_client:, mcp_client:, available_tools:, executor:, instance_name:, model:, temperature: nil, reasoning_effort: nil, zdr: false)
         @openai_client = openai_client
         @mcp_client = mcp_client
         @available_tools = available_tools
@@ -14,6 +14,7 @@ module ClaudeSwarm
         @model = model
         @temperature = temperature
         @reasoning_effort = reasoning_effort
+        @zdr = zdr # Not used in chat_completion API, but kept for compatibility
         @conversation_messages = []
       end
 

data/lib/claude_swarm/openai/executor.rb

@@ -31,7 +31,7 @@ module ClaudeSwarm
         instance_name: nil, instance_id: nil, calling_instance: nil, calling_instance_id: nil,
         claude_session_id: nil, additional_directories: [], debug: false,
         temperature: nil, api_version: "chat_completion", openai_token_env: "OPENAI_API_KEY",
-        base_url: nil, reasoning_effort: nil)
+        base_url: nil, reasoning_effort: nil, zdr: false)
         # Call parent initializer for common attributes
         super(
           working_directory: working_directory,
@@ -52,6 +52,7 @@ module ClaudeSwarm
         @api_version = api_version
         @base_url = base_url
         @reasoning_effort = reasoning_effort
+        @zdr = zdr
 
         # Conversation state for maintaining context
         @conversation_messages = []
@@ -162,6 +163,7 @@ module ClaudeSwarm
           model: @model,
           temperature: @temperature,
           reasoning_effort: @reasoning_effort,
+          zdr: @zdr,
         }
 
         if @api_version == "responses"

data/lib/claude_swarm/openai/responses.rb

@@ -5,7 +5,7 @@ module ClaudeSwarm
     class Responses
       MAX_TURNS_WITH_TOOLS = 100_000 # virtually infinite
 
-      def initialize(openai_client:, mcp_client:, available_tools:, executor:, instance_name:, model:, temperature: nil, reasoning_effort: nil)
+      def initialize(openai_client:, mcp_client:, available_tools:, executor:, instance_name:, model:, temperature: nil, reasoning_effort: nil, zdr: false)
         @openai_client = openai_client
         @mcp_client = mcp_client
         @available_tools = available_tools
@@ -14,6 +14,7 @@ module ClaudeSwarm
         @model = model
         @temperature = temperature
         @reasoning_effort = reasoning_effort
+        @zdr = zdr
         @system_prompt = nil
       end
 
@@ -58,6 +59,7 @@ module ClaudeSwarm
           else
             input
           end
+          conversation_array << { role: "user", content: parameters[:input] }
         else
           # Follow-up call with conversation array (function calls + outputs)
           parameters[:input] = conversation_array
@@ -70,8 +72,8 @@ module ClaudeSwarm
           @executor.logger.info { "Conversation item IDs: #{conversation_ids.inspect}" }
         end
 
-        # Add previous response ID for conversation continuity
-        parameters[:previous_response_id] = previous_response_id if previous_response_id
+        # Add previous response ID for conversation continuity (unless zdr is enabled)
+        parameters[:previous_response_id] = @zdr ? nil : previous_response_id
 
         # Add tools if available
         if @available_tools&.any?
@@ -106,7 +108,7 @@ module ClaudeSwarm
           @executor.logger.error { "Request parameters: #{JsonHandler.pretty_generate!(parameters)}" }
 
           # Try to extract and log the response body for better debugging
-          if e.respond_to?(:response)
+          if e.respond_to?(:response) && e.response
             begin
               error_body = e.response[:body]
               @executor.logger.error { "Error response body: #{error_body}" }
@@ -122,7 +124,7 @@ module ClaudeSwarm
             error: {
               class: e.class.to_s,
               message: e.message,
-              response_body: e.respond_to?(:response) ? e.response[:body] : nil,
+              response_body: e.respond_to?(:response) && e.response ? e.response[:body] : nil,
               backtrace: e.backtrace.first(5),
             },
           })
@@ -146,33 +148,21 @@ module ClaudeSwarm
 
         # Handle response based on output structure
         output = response["output"]
-
         if output.nil?
           @executor.logger.error { "No output in response" }
           return "Error: No output in OpenAI response"
         end
 
         # Check if output is an array (as per documentation)
-        if output.is_a?(Array) && !output.empty?
+        if output.is_a?(Array) && output.any?
+          new_conversation = conversation_array.dup
+          new_conversation.concat(output)
           # Check if there are function calls
           function_calls = output.select { |item| item["type"] == "function_call" }
-
           if function_calls.any?
-            # Check if we already have a conversation going
-            if conversation_array.empty?
-              # First depth - build new conversation
-              new_conversation = build_conversation_with_outputs(function_calls)
-            else
-              # Subsequent depth - append to existing conversation
-              # Don't re-add function calls, just add the new ones and their outputs
-              new_conversation = conversation_array.dup
-              append_new_outputs(function_calls, new_conversation)
-            end
-
-            # Recursively process with updated conversation
+            append_new_outputs(function_calls, new_conversation)
             process_responses_api(nil, new_conversation, response_id, depth + 1)
           else
-            # Look for text response
             extract_text_response(output)
           end
         else

data/lib/claude_swarm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClaudeSwarm
-  VERSION = "1.0.8"
+  VERSION = "1.0.10"
 end

data/lib/swarm_cli/commands/run.rb

@@ -134,8 +134,8 @@ module SwarmCLI
 
       def emit_validation_warnings(swarm, formatter)
         # Setup temporary logging to capture and emit warnings
-        SwarmSDK::LogCollector.on_log do |log_entry|
-          formatter.on_log(log_entry) if log_entry[:type] == "model_lookup_warning"
+        SwarmSDK::LogCollector.subscribe(filter: { type: "model_lookup_warning" }) do |log_entry|
+          formatter.on_log(log_entry)
         end
 
         SwarmSDK::LogStream.emitter = SwarmSDK::LogCollector

data/lib/swarm_cli/config_loader.rb

@@ -5,7 +5,7 @@ module SwarmCLI
   #
   # Supports:
   # - YAML files (.yml, .yaml) - loaded via SwarmSDK.load_file
-  # - Ruby DSL files (.rb) - executed and expected to return a SwarmSDK::Swarm or SwarmSDK::NodeOrchestrator instance
+  # - Ruby DSL files (.rb) - executed and expected to return a SwarmSDK::Swarm or SwarmSDK::Workflow instance
   #
   # @example Load YAML config
   #   swarm = ConfigLoader.load("config.yml")
@@ -19,10 +19,10 @@ module SwarmCLI
       #
       # Detects file type by extension:
       # - .yml, .yaml -> Load as YAML using SwarmSDK.load_file
-      # - .rb -> Execute as Ruby DSL and expect SwarmSDK::Swarm or SwarmSDK::NodeOrchestrator instance
+      # - .rb -> Execute as Ruby DSL and expect SwarmSDK::Swarm or SwarmSDK::Workflow instance
       #
       # @param path [String, Pathname] Path to configuration file
-      # @return [SwarmSDK::Swarm, SwarmSDK::NodeOrchestrator] Configured swarm or orchestrator instance
+      # @return [SwarmSDK::Swarm, SwarmSDK::Workflow] Configured swarm or workflow instance
       # @raise [SwarmCLI::ConfigurationError] If file not found or invalid format
       def load(path)
         path = Pathname.new(path).expand_path
@@ -59,27 +59,27 @@ module SwarmCLI
       # Load Ruby DSL configuration file
       #
       # Executes the Ruby file in a clean binding and expects it to return
-      # a SwarmSDK::Swarm or SwarmSDK::NodeOrchestrator instance. The file should
-      # use SwarmSDK.build or create a Swarm/NodeOrchestrator instance directly.
+      # a SwarmSDK::Swarm or SwarmSDK::Workflow instance. The file should
+      # use SwarmSDK.build or SwarmSDK.workflow or create a Swarm/Workflow instance directly.
       #
       # @param path [Pathname] Path to Ruby DSL file
-      # @return [SwarmSDK::Swarm, SwarmSDK::NodeOrchestrator] Configured swarm or orchestrator instance
+      # @return [SwarmSDK::Swarm, SwarmSDK::Workflow] Configured swarm or workflow instance
       # @raise [ConfigurationError] If file doesn't return a valid instance
       def load_ruby_dsl(path)
         # Read the file content
         content = path.read
 
         # Execute in a clean binding with SwarmSDK available
-        # This allows the DSL file to use SwarmSDK.build directly
+        # This allows the DSL file to use SwarmSDK.build or SwarmSDK.workflow directly
         result = eval(content, binding, path.to_s, 1) # rubocop:disable Security/Eval
 
-        # Validate result is a Swarm or NodeOrchestrator instance
+        # Validate result is a Swarm or Workflow instance
         # Both have the same execute(prompt) interface
-        unless result.is_a?(SwarmSDK::Swarm) || result.is_a?(SwarmSDK::NodeOrchestrator)
+        unless result.is_a?(SwarmSDK::Swarm) || result.is_a?(SwarmSDK::Workflow)
           raise ConfigurationError,
-            "Ruby DSL file must return a SwarmSDK::Swarm or SwarmSDK::NodeOrchestrator instance. " \
+            "Ruby DSL file must return a SwarmSDK::Swarm or SwarmSDK::Workflow instance. " \
               "Got: #{result.class}. " \
-              "Use: SwarmSDK.build { ... } or Swarm.new(...)"
+              "Use: SwarmSDK.build { ... } or SwarmSDK.workflow { ... }"
         end
 
         result

data/lib/swarm_cli/formatters/human_formatter.rb

@@ -99,8 +99,6 @@ module SwarmCLI
           handle_llm_retry_attempt(entry)
         when "llm_retry_exhausted"
           handle_llm_retry_exhausted(entry)
-        when "response_parse_error"
-          handle_response_parse_error(entry)
         end
       end
 
@@ -647,37 +645,6 @@ module SwarmCLI
         )
       end
 
-      def handle_response_parse_error(entry)
-        agent = entry[:agent]
-        error_class = entry[:error_class]
-        error_message = entry[:error_message]
-
-        # Stop agent thinking spinner (if active)
-        unless @quiet
-          spinner_key = "agent_#{agent}".to_sym
-          @spinner_manager.stop(spinner_key) if @spinner_manager.active?(spinner_key)
-        end
-
-        lines = [
-          @pastel.red("Failed to parse LLM API response"),
-          @pastel.dim("Error: #{error_class}: #{error_message}"),
-        ]
-
-        # Add response body preview if available (truncated)
-        if entry[:response_body]
-          body_preview = entry[:response_body].to_s[0..200]
-          body_preview += "..." if entry[:response_body].to_s.length > 200
-          lines << @pastel.dim("Response: #{body_preview}")
-        end
-
-        @output.puts @panel.render(
-          type: :error,
-          title: "PARSE ERROR #{@agent_badge.render(agent)}",
-          lines: lines,
-          indent: @depth_tracker.get(agent),
-        )
-      end
-
       def display_todo_list(agent, timestamp)
         todos = SwarmSDK::Tools::Stores::TodoManager.get_todos(agent.to_sym)
         indent = @depth_tracker.indent(agent)

data/lib/swarm_cli/interactive_repl.rb

@@ -534,7 +534,7 @@ module SwarmCLI
       lead = @swarm.agent(@swarm.lead_agent)
 
       # Clear the agent's conversation history
-      lead.reset_messages!
+      lead.replace_messages([])
 
       # Clear REPL conversation history
       @conversation_history.clear
@@ -575,7 +575,7 @@ module SwarmCLI
         case tool_name
         when /^Memory/, "LoadSkill"
           memory_tools << tool_name
-        when /^DelegateTaskTo/
+        when /^WorkWith/
           delegation_tools << tool_name
         when /^mcp__/
           mcp_tools << tool_name

data/lib/swarm_cli/ui/icons.rb

@@ -31,29 +31,6 @@ module SwarmCLI
       ARROW_RIGHT = "→"
       BULLET = "•"
       COMPRESS = "🗜️"
-
-      # All icons as hash for backward compatibility
-      ALL = {
-        thinking: THINKING,
-        response: RESPONSE,
-        success: SUCCESS,
-        error: ERROR,
-        info: INFO,
-        warning: WARNING,
-        agent: AGENT,
-        tool: TOOL,
-        delegate: DELEGATE,
-        result: RESULT,
-        hook: HOOK,
-        llm: LLM,
-        tokens: TOKENS,
-        cost: COST,
-        time: TIME,
-        sparkles: SPARKLES,
-        arrow_right: ARROW_RIGHT,
-        bullet: BULLET,
-        compress: COMPRESS,
-      }.freeze
     end
   end
 end

data/lib/swarm_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SwarmCLI
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

data/lib/swarm_memory/adapters/filesystem_adapter.rb

@@ -93,10 +93,10 @@ module SwarmMemory
                 "Clear old entries or use smaller content."
             end
 
-            # Strip .md extension and flatten path for disk storage
-            # "concepts/ruby/classes.md" → "concepts--ruby--classes"
+            # Strip .md extension for disk storage
+            # "concepts/ruby/classes.md" → "concepts/ruby/classes"
             base_path = file_path.sub(/\.md\z/, "")
-            disk_path = flatten_path(base_path)
+            disk_path = base_path
 
             # 1. Write content to .md file (stored exactly as provided)
             md_file = File.join(@directory, "#{disk_path}.md")
@@ -162,9 +162,9 @@ module SwarmMemory
           return entry.content
         end
 
-        # Strip .md extension and flatten path
+        # Strip .md extension
         base_path = file_path.sub(/\.md\z/, "")
-        disk_path = flatten_path(base_path)
+        disk_path = base_path
         md_file = File.join(@directory, "#{disk_path}.md")
 
         raise ArgumentError, "memory://#{file_path} not found" unless File.exist?(md_file)
@@ -189,9 +189,9 @@ module SwarmMemory
           return load_virtual_entry(file_path)
         end
 
-        # Strip .md extension and flatten path
+        # Strip .md extension
         base_path = file_path.sub(/\.md\z/, "")
-        disk_path = flatten_path(base_path)
+        disk_path = base_path
         md_file = File.join(@directory, "#{disk_path}.md")
         yaml_file = File.join(@directory, "#{disk_path}.yml")
 
@@ -230,9 +230,9 @@ module SwarmMemory
           @semaphore.acquire do
             raise ArgumentError, "file_path is required" if file_path.nil? || file_path.to_s.strip.empty?
 
-            # Strip .md extension and flatten path
+            # Strip .md extension
             base_path = file_path.sub(/\.md\z/, "")
-            disk_path = flatten_path(base_path)
+            disk_path = base_path
             md_file = File.join(@directory, "#{disk_path}.md")
 
             raise ArgumentError, "memory://#{file_path} not found" unless File.exist?(md_file)
@@ -500,29 +500,6 @@ module SwarmMemory
         )
       end
 
-      # Flatten path for disk storage
-      # "concepts/ruby/classes" → "concepts--ruby--classes"
-      #
-      # @param logical_path [String] Logical path with slashes
-      # @return [String] Flattened path with --
-      # Identity function - paths are now stored hierarchically
-      # Kept for backward compatibility during transition
-      #
-      # @param logical_path [String] Logical path
-      # @return [String] Same path (no flattening)
-      def flatten_path(logical_path)
-        logical_path
-      end
-
-      # Identity function - paths are now stored hierarchically
-      # Kept for backward compatibility during transition
-      #
-      # @param disk_path [String] Disk path
-      # @return [String] Same path (no unflattening)
-      def unflatten_path(disk_path)
-        disk_path
-      end
-
       # Check if content is a stub (redirect)
       #
       # @param content [String] File content
@@ -566,7 +543,7 @@ module SwarmMemory
       # @return [void]
       def increment_hits(file_path)
         base_path = file_path.sub(/\.md\z/, "")
-        disk_path = flatten_path(base_path)
+        disk_path = base_path
         yaml_file = File.join(@directory, "#{disk_path}.yml")
         return unless File.exist?(yaml_file)
 
@@ -587,7 +564,7 @@ module SwarmMemory
       # @return [Integer] Size in bytes
       def get_entry_size(file_path)
         base_path = file_path.sub(/\.md\z/, "")
-        disk_path = flatten_path(base_path)
+        disk_path = base_path
         yaml_file = File.join(@directory, "#{disk_path}.yml")
 
         if File.exist?(yaml_file)

data/lib/swarm_memory/integration/sdk_plugin.rb

@@ -156,7 +156,7 @@ module SwarmMemory
       # @return [String] Memory prompt contribution
       def system_prompt_contribution(agent_definition:, storage:)
         # Extract mode from memory config
-        memory_config = agent_definition.memory
+        memory_config = agent_definition.plugin_config(:memory)
         mode = if memory_config.is_a?(SwarmMemory::DSL::MemoryConfig)
           memory_config.mode # MemoryConfig object from DSL
         elsif memory_config.respond_to?(:mode)
@@ -204,20 +204,100 @@ module SwarmMemory
       # @param agent_definition [Agent::Definition] Agent definition
       # @return [Boolean] True if agent has memory configuration
       def storage_enabled?(agent_definition)
-        agent_definition.memory_enabled?
+        memory_config = agent_definition.plugin_config(:memory)
+        return false if memory_config.nil?
+
+        # MemoryConfig object (from DSL)
+        return memory_config.enabled? if memory_config.respond_to?(:enabled?)
+
+        # Hash (from YAML) - check for directory key
+        if memory_config.is_a?(Hash)
+          directory = memory_config[:directory] || memory_config["directory"]
+          return !directory.nil? && !directory.to_s.strip.empty?
+        end
+
+        false
       end
 
       # Contribute to agent serialization
       #
-      # Preserves memory configuration when agents are cloned (e.g., in NodeOrchestrator).
+      # Preserves memory configuration when agents are cloned (e.g., in Workflow).
       # This allows memory configuration to persist across node transitions.
       #
       # @param agent_definition [Agent::Definition] Agent definition
       # @return [Hash] Memory config to include in to_h
       def serialize_config(agent_definition:)
-        return {} unless agent_definition.memory
+        memory_config = agent_definition.plugin_config(:memory)
+        return {} unless memory_config
+
+        { memory: memory_config }
+      end
+
+      # Snapshot plugin-specific state for an agent
+      #
+      # Captures memory read tracking state for session persistence.
+      # This allows agents to remember which memory entries they've read
+      # across sessions.
+      #
+      # @param agent_name [Symbol] Agent identifier
+      # @return [Hash] Plugin-specific state
+      def snapshot_agent_state(agent_name)
+        entries_with_digests = Core::StorageReadTracker.get_read_entries(agent_name)
+        return {} if entries_with_digests.empty?
+
+        { read_entries: entries_with_digests }
+      end
+
+      # Restore plugin-specific state for an agent
+      #
+      # Restores memory read tracking state from snapshot.
+      # This is idempotent - calling multiple times with same state
+      # produces the same result.
+      #
+      # @param agent_name [Symbol] Agent identifier
+      # @param state [Hash] Previously snapshotted state (with symbol keys)
+      # @return [void]
+      def restore_agent_state(agent_name, state)
+        entries = state[:read_entries] || state["read_entries"]
+        return unless entries
+
+        Core::StorageReadTracker.restore_read_entries(agent_name, entries)
+      end
+
+      # Get digest for a memory tool result
+      #
+      # Returns the digest for a MemoryRead tool call, enabling change detection
+      # hooks to know if a memory entry has been modified since last read.
+      #
+      # @param agent_name [Symbol] Agent identifier
+      # @param tool_name [String] Name of the tool
+      # @param path [String] Path of the memory entry
+      # @return [String, nil] Digest string or nil if not a memory tool
+      def get_tool_result_digest(agent_name:, tool_name:, path:)
+        return unless tool_name == "MemoryRead"
 
-        { memory: agent_definition.memory }
+        Core::StorageReadTracker.get_read_entries(agent_name)[path]
+      end
+
+      # Translate YAML configuration into DSL calls
+      #
+      # Called during YAML-to-DSL translation. Handles memory-specific YAML
+      # configuration and translates it into DSL method calls on the builder.
+      #
+      # @param builder [Agent::Builder] Builder instance (self in DSL context)
+      # @param agent_config [Hash] Full agent config from YAML
+      # @return [void]
+      def translate_yaml_config(builder, agent_config)
+        memory_config = agent_config[:memory]
+        return unless memory_config
+
+        builder.instance_eval do
+          memory do
+            directory(memory_config[:directory]) if memory_config[:directory]
+            adapter(memory_config[:adapter]) if memory_config[:adapter]
+            mode(memory_config[:mode]) if memory_config[:mode]
+          end
+        end
       end
 
       # Lifecycle: Agent initialized
@@ -239,7 +319,7 @@ module SwarmMemory
         return unless storage # Only proceed if memory is enabled for this agent
 
         # Extract mode from memory config
-        memory_config = agent_definition.memory
+        memory_config = agent_definition.plugin_config(:memory)
         mode = if memory_config.is_a?(SwarmMemory::DSL::MemoryConfig)
           memory_config.mode # MemoryConfig object from DSL
         elsif memory_config.respond_to?(:mode)
@@ -281,7 +361,7 @@ module SwarmMemory
             agent_definition: agent_definition,
           )
 
-          agent.with_tool(load_skill_tool)
+          agent.add_tool(load_skill_tool)
         end
 
         # Mark mode-specific memory tools + LoadSkill as immutable

data/lib/swarm_memory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SwarmMemory
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

data/lib/swarm_memory.rb

@@ -42,7 +42,7 @@ loader.setup
 # These must be loaded after Zeitwerk but before anything uses them
 require_relative "swarm_memory/dsl/memory_config"
 require_relative "swarm_memory/dsl/builder_extension"
-require_relative "swarm_memory/chat_extension"
+# NOTE: ChatExtension was removed in favor of SDK's built-in remove_tool method
 
 module SwarmMemory
   class << self