swarm_memory 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8422c40d79fb0c2adcd9e1de9a4cfdf289ced49ef27507969ea797c4187a0ee1
-  data.tar.gz: 875f1429c37f2485d32641a7d96c9cae5db226a5bc2fc3e2f8c1443946e021b9
+  metadata.gz: ebb25752a42e174408e197c5b24d94ebfbd2a57cfd5a26101e839f2375e54b8f
+  data.tar.gz: 9558c9e19cfb486872d6cee1b445506e9c599f8d4a767670743f3a3f1481fb49
 SHA512:
-  metadata.gz: 298c0506a2f486aab1ad29c9f6e4605fe3fbb91fb17f7e3ee913b046f97a9d347312afd686e4bf26d28d6329c8974d421d39ee488e04bf2bc4cde22fea8cdc8c
-  data.tar.gz: c472ec8754b18a2a8d0ab1ae1a0dc391b2f4fffc2de670831272938d81e51a6716c81343b174afa8833d256e28a728fdd198e0bb2b6d92e13adc085c786d2abc
+  metadata.gz: a5d16f99c9aeb5fca71dfed900a8e44337d2fa5a1ee58fbec71e25f6825091973c0ef849a9c28cd88eb3bfdac9a481bbe743de2fd034fe3f124c8ea0aa23c5f1
+  data.tar.gz: b2ce4c330d45730c723a51786301d39dcc8c3b57eb19f65f6510b5b3027620d3ab214df201e8237b2b0e36f82c726b04e233cbb0266187aa7743446e1215b854

data/lib/claude_swarm/claude_mcp_server.rb

@@ -36,6 +36,7 @@ module ClaudeSwarm
           openai_token_env: instance_config[:openai_token_env],
           base_url: instance_config[:base_url],
           reasoning_effort: instance_config[:reasoning_effort],
+          zdr: instance_config[:zdr],
         )
       else
         # Default Claude behavior - always use SDK

data/lib/claude_swarm/cli.rb

@@ -172,6 +172,10 @@ module ClaudeSwarm
     method_option :reasoning_effort,
       type: :string,
       desc: "Reasoning effort for OpenAI models"
+    method_option :zdr,
+      type: :boolean,
+      default: false,
+      desc: "Enable ZDR for OpenAI models"
     def mcp_serve
       # Validate reasoning_effort if provided
       if options[:reasoning_effort]
@@ -181,14 +185,6 @@ module ClaudeSwarm
           exit(1)
         end
 
-        # Validate it's used with an o-series model
-        model = options[:model]
-        unless model&.match?(ClaudeSwarm::Configuration::O_SERIES_MODEL_PATTERN)
-          error("reasoning_effort is only supported for o-series models (o1, o1 Preview, o1-mini, o1-pro, o3, o3-mini, o3-pro, o3-deep-research, o4-mini, o4-mini-deep-research, etc.)")
-          error("Current model: #{model}")
-          exit(1)
-        end
-
         # Validate the value
         unless ClaudeSwarm::Configuration::VALID_REASONING_EFFORTS.include?(options[:reasoning_effort])
           error("reasoning_effort must be 'low', 'medium', or 'high'")
@@ -196,16 +192,6 @@ module ClaudeSwarm
         end
       end
 
-      # Validate temperature is not used with o-series models
-      if options[:temperature] && options[:provider] == "openai"
-        model = options[:model]
-        if model&.match?(ClaudeSwarm::Configuration::O_SERIES_MODEL_PATTERN)
-          error("temperature parameter is not supported for o-series models (#{model})")
-          error("O-series models use deterministic reasoning and don't accept temperature settings")
-          exit(1)
-        end
-      end
-
       instance_config = {
         name: options[:name],
         directory: options[:directory],
@@ -226,6 +212,7 @@ module ClaudeSwarm
         openai_token_env: options[:openai_token_env],
         base_url: options[:base_url],
         reasoning_effort: options[:reasoning_effort],
+        zdr: options[:zdr],
       }
 
       begin

data/lib/claude_swarm/configuration.rb

@@ -4,15 +4,13 @@ module ClaudeSwarm
   class Configuration
     # Frozen constants for validation
     VALID_PROVIDERS = ["claude", "openai"].freeze
-    OPENAI_SPECIFIC_FIELDS = ["temperature", "api_version", "openai_token_env", "base_url", "reasoning_effort"].freeze
+    OPENAI_SPECIFIC_FIELDS = ["temperature", "api_version", "openai_token_env", "base_url", "reasoning_effort", "zdr"].freeze
     VALID_API_VERSIONS = ["chat_completion", "responses"].freeze
     VALID_REASONING_EFFORTS = ["low", "medium", "high"].freeze
 
     # Regex patterns
     ENV_VAR_PATTERN = /\$\{([^}]+)\}/
     ENV_VAR_WITH_DEFAULT_PATTERN = /\$\{([^:}]+)(:=([^}]*))?\}/
-    O_SERIES_MODEL_PATTERN = /^(o\d+(\s+(Preview|preview))?(-pro|-mini|-deep-research|-mini-deep-research)?|gpt-5(-mini|-nano)?)$/
-
     attr_reader :config, :config_path, :swarm, :swarm_name, :main_instance, :instances, :base_dir
 
     def initialize(config_path, base_dir: nil, options: {})
@@ -165,7 +163,6 @@ module ClaudeSwarm
 
       # Parse provider (optional, defaults to claude)
       provider = config["provider"]
-      model = config["model"]
 
       # Validate provider value if specified
       if provider && !VALID_PROVIDERS.include?(provider)
@@ -183,17 +180,6 @@ module ClaudeSwarm
         unless VALID_REASONING_EFFORTS.include?(config["reasoning_effort"])
           raise Error, "Instance '#{name}' has invalid reasoning_effort '#{config["reasoning_effort"]}'. Must be 'low', 'medium', or 'high'"
         end
-
-        # Validate it's only used with o-series or gpt-5 models
-        # Support patterns like: o1, o1-mini, o1-pro, o1 Preview, o3-deep-research, o4-mini-deep-research, gpt-5, gpt-5-mini, gpt-5-nano, etc.
-        unless model&.match?(O_SERIES_MODEL_PATTERN)
-          raise Error, "Instance '#{name}' has reasoning_effort but model '#{model}' is not an o-series or gpt-5 model (o1, o1 Preview, o1-mini, o1-pro, o3, o3-mini, o3-pro, o3-deep-research, o4-mini, o4-mini-deep-research, gpt-5, gpt-5-mini, gpt-5-nano, etc.)"
-        end
-      end
-
-      # Validate temperature is not used with o-series or gpt-5 models when provider is openai
-      if provider == "openai" && config["temperature"] && model&.match?(O_SERIES_MODEL_PATTERN)
-        raise Error, "Instance '#{name}' has temperature parameter but model '#{model}' is an o-series or gpt-5 model. O-series and gpt-5 models use deterministic reasoning and don't accept temperature settings"
       end
 
       # Validate OpenAI-specific fields only when provider is not "openai"
@@ -246,6 +232,7 @@ module ClaudeSwarm
         instance_config[:openai_token_env] = config["openai_token_env"] || "OPENAI_API_KEY"
         instance_config[:base_url] = config["base_url"]
         instance_config[:reasoning_effort] = config["reasoning_effort"] if config["reasoning_effort"]
+        instance_config[:zdr] = config["zdr"] if config.key?("zdr")
         # Default vibe to true for OpenAI instances if not specified
         instance_config[:vibe] = true if config["vibe"].nil?
       elsif config["vibe"].nil?

data/lib/claude_swarm/mcp_generator.rb

@@ -174,6 +174,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
 
@@ -67,17 +68,8 @@ module ClaudeSwarm
           messages: messages,
         }
 
-        # Only add temperature for non-o-series models
-        # O-series models don't support temperature parameter
-        if @temperature && !@model.match?(ClaudeSwarm::Configuration::O_SERIES_MODEL_PATTERN)
-          parameters[:temperature] = @temperature
-        end
-
-        # Only add reasoning_effort for o-series models
-        # reasoning_effort is only supported by o-series models: o1, o1 Preview, o1-mini, o1-pro, o3, o3-mini, o3-pro, o3-deep-research, o4-mini, o4-mini-deep-research, etc.
-        if @reasoning_effort && @model.match?(ClaudeSwarm::Configuration::O_SERIES_MODEL_PATTERN)
-          parameters[:reasoning_effort] = @reasoning_effort
-        end
+        parameters[:temperature] = @temperature if @temperature
+        parameters[:reasoning_effort] = @reasoning_effort if @reasoning_effort
 
         # Add tools if available
         parameters[:tools] = @mcp_client.to_openai_tools if @available_tools&.any? && @mcp_client

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
 
@@ -46,17 +47,8 @@ module ClaudeSwarm
           model: @model,
         }
 
-        # Only add temperature for non-o-series models
-        # O-series models don't support temperature parameter
-        unless @model.match?(ClaudeSwarm::Configuration::O_SERIES_MODEL_PATTERN)
-          parameters[:temperature] = @temperature
-        end
-
-        # Only add reasoning effort for o-series models
-        # reasoning is only supported by o-series models: o1, o1 Preview, o1-mini, o1-pro, o3, o3-mini, o3-pro, o3-deep-research, o4-mini, o4-mini-deep-research, etc.
-        if @reasoning_effort && @model.match?(ClaudeSwarm::Configuration::O_SERIES_MODEL_PATTERN)
-          parameters[:reasoning] = { effort: @reasoning_effort }
-        end
+        parameters[:temperature] = @temperature if @temperature
+        parameters[:reasoning] = { effort: @reasoning_effort } if @reasoning_effort
 
         # On first call, use string input (can include system prompt)
         # On subsequent calls with function results, use array input
@@ -67,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
@@ -79,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?
@@ -115,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}" }
@@ -131,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),
             },
           })
@@ -155,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.6"
+  VERSION = "1.0.9"
 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

@@ -95,11 +95,18 @@ module SwarmCLI
           handle_breakpoint_enter(entry)
         when "breakpoint_exit"
           handle_breakpoint_exit(entry)
+        when "llm_retry_attempt"
+          handle_llm_retry_attempt(entry)
+        when "llm_retry_exhausted"
+          handle_llm_retry_exhausted(entry)
         end
       end
 
       # Called when swarm execution completes successfully
       def on_success(result:)
+        # Defensive: ensure all spinners are stopped before showing result
+        @spinner_manager.stop_all
+
         if @mode == :non_interactive
           # Full result display with summary
           @output.puts
@@ -115,6 +122,9 @@ module SwarmCLI
 
       # Called when swarm execution fails
       def on_error(error:, duration: nil)
+        # Defensive: ensure all spinners are stopped before showing error
+        @spinner_manager.stop_all
+
         @output.puts
         @output.puts @divider.full
         print_error(error)
@@ -575,6 +585,66 @@ module SwarmCLI
         @output.puts
       end
 
+      def handle_llm_retry_attempt(entry)
+        agent = entry[:agent]
+        attempt = entry[:attempt]
+        max_retries = entry[:max_retries]
+        error_class = entry[:error_class]
+        error_message = entry[:error_message]
+        retry_delay = entry[:retry_delay]
+
+        # 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.yellow("LLM API request failed (attempt #{attempt}/#{max_retries})"),
+          @pastel.dim("Error: #{error_class}: #{error_message}"),
+          @pastel.dim("Retrying in #{retry_delay}s..."),
+        ]
+
+        @output.puts @panel.render(
+          type: :warning,
+          title: "RETRY #{@agent_badge.render(agent)}",
+          lines: lines,
+          indent: @depth_tracker.get(agent),
+        )
+
+        # Restart spinner for next attempt
+        unless @quiet
+          spinner_key = "agent_#{agent}".to_sym
+          @spinner_manager.start(spinner_key, "#{agent} is retrying...")
+        end
+      end
+
+      def handle_llm_retry_exhausted(entry)
+        agent = entry[:agent]
+        attempts = entry[:attempts]
+        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("LLM API request failed after #{attempts} attempts"),
+          @pastel.dim("Error: #{error_class}: #{error_message}"),
+          @pastel.dim("No more retries available"),
+        ]
+
+        @output.puts @panel.render(
+          type: :error,
+          title: "RETRY EXHAUSTED #{@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

@@ -81,6 +81,9 @@ module SwarmCLI
       display_session_summary
       exit(130)
     ensure
+      # Defensive: ensure all spinners are stopped on exit
+      @formatter&.spinner_manager&.stop_all
+
       # Save history on exit
       save_persistent_history
     end
@@ -432,11 +435,12 @@ module SwarmCLI
         end
       end
 
+      # CRITICAL: Stop all spinners after execution completes
+      # This ensures spinner doesn't interfere with error/success display or REPL prompt
+      @formatter.spinner_manager.stop_all
+
       # Handle cancellation (result is nil when cancelled)
       if result.nil?
-        # Stop all active spinners
-        @formatter.spinner_manager.stop_all
-
         puts ""
         puts @colors[:warning].call("✗ Request cancelled by user")
         puts ""
@@ -459,6 +463,8 @@ module SwarmCLI
       # Add response to history
       @conversation_history << { role: "agent", content: result.content }
     rescue StandardError => e
+      # Defensive: ensure spinners are stopped on exception
+      @formatter.spinner_manager.stop_all
       @formatter.on_error(error: e)
     end
 
@@ -528,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
@@ -569,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.2"
+  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)