claude_swarm 1.0.9 → 1.0.11

data/docs/v2/reference/swarm_memory_technical_details.md

@@ -855,28 +855,7 @@ end
 
 ---
 
-### 4. MemoryMultiEdit
-
-**File:** `lib/swarm_memory/tools/memory_multi_edit.rb`
-
-Apply multiple edits sequentially to one entry.
-
-**Input (JSON array):**
-```json
-[
-  {"old_string": "status: pending", "new_string": "status: resolved"},
-  {"old_string": "confidence: medium", "new_string": "confidence: high"}
-]
-```
-
-**Behavior:**
-- Edits applied **sequentially** (each sees previous results)
-- **All-or-nothing** - if any edit fails, NO changes saved
-- Shows which edits succeeded before failure
-
----
-
-### 5. MemoryGlob
+### 4. MemoryGlob
 
 **File:** `lib/swarm_memory/tools/memory_glob.rb`
 
@@ -915,7 +894,7 @@ MAX_RESULTS = 500  # Truncates with system reminder if exceeded
 
 ---
 
-### 6. MemoryGrep
+### 5. MemoryGrep
 
 **File:** `lib/swarm_memory/tools/memory_grep.rb`
 
@@ -949,7 +928,7 @@ path: "skill/debug.md"     # Just that file
 
 ---
 
-### 7. MemoryDelete
+### 6. MemoryDelete
 
 **File:** `lib/swarm_memory/tools/memory_delete.rb`
 
@@ -964,7 +943,7 @@ MemoryDelete(file_path: "experience/temp-experiment.md")
 
 ---
 
-### 8. MemoryDefrag
+### 7. MemoryDefrag
 
 **File:** `lib/swarm_memory/tools/memory_defrag.rb`
 
@@ -1035,7 +1014,7 @@ MemoryDefrag(action: "full", dry_run: true)  # Preview all
 
 ---
 
-### 9. LoadSkill
+### 8. LoadSkill
 
 **File:** `lib/swarm_memory/tools/load_skill.rb`
 
@@ -1079,7 +1058,7 @@ sequenceDiagram
 **Immutable Tools:**
 ```ruby
 # These tools NEVER removed during skill loading:
-- MemoryWrite, MemoryRead, MemoryEdit, MemoryMultiEdit
+- MemoryWrite, MemoryRead, MemoryEdit
 - MemoryDelete, MemoryGlob, MemoryGrep, MemoryDefrag
 - LoadSkill (self)
 ```
@@ -1243,7 +1222,7 @@ class SDKPlugin < SwarmSDK::Plugin
     # Return memory prompt based on mode
   end
 
-  def storage_enabled?(agent_definition)
+  def memory_configured?(agent_definition)
     agent_definition.memory_enabled?
   end
 end
@@ -2025,7 +2004,6 @@ lib/swarm_memory/
 │   ├── memory_write.rb
 │   ├── memory_read.rb
 │   ├── memory_edit.rb
-│   ├── memory_multi_edit.rb
 │   ├── memory_delete.rb
 │   ├── memory_glob.rb
 │   ├── memory_grep.rb

data/docs/v2/reference/yaml.md

@@ -6,25 +6,55 @@ Complete YAML configuration reference for SwarmSDK v2.
 
 ## Document Structure
 
-SwarmSDK v2 configurations follow this structure:
+SwarmSDK v2 configurations support two types, distinguished by the root key:
+
+### Simple Swarm (Multi-Agent Collaboration)
 
 ```yaml
 version: 2
-swarm:
-  name: "Swarm Name"
-  lead: agent_name
+swarm:                    # Use 'swarm:' key for swarms
+  name: "Development Team"
+  lead: backend           # Required for swarms
   agents:
-    agent_name:
+    backend:
       # Agent configuration
-  all_agents:
-    # Shared agent configuration
-  hooks:
-    # Swarm-level hooks
-  nodes:
-    # Node configurations (optional)
-  start_node: node_name  # Required if nodes defined
+    tester:
+      # Agent configuration
+```
+
+**Returns:** `SwarmSDK::Swarm` when loaded with `SwarmSDK.load_file`
+
+### Workflow (Multi-Stage Pipeline)
+
+```yaml
+version: 2
+workflow:                 # Use 'workflow:' key for workflows
+  name: "Build Pipeline"
+  start_node: planning    # Required for workflows
+  agents:
+    architect:
+      # Agent configuration
+    coder:
+      # Agent configuration
+  nodes:                  # Required for workflows
+    planning:
+      agents:
+        - agent: architect
+    implementation:
+      agents:
+        - agent: coder
+      dependencies:
+        - planning
 ```
 
+**Returns:** `SwarmSDK::Workflow` when loaded with `SwarmSDK.load_file`
+
+**Type Detection:**
+- `swarm:` key → Creates `SwarmSDK::Swarm` (requires `lead:`, cannot have `nodes:`)
+- `workflow:` key → Creates `SwarmSDK::Workflow` (requires `start_node:` and `nodes:`)
+- Cannot have both `swarm:` and `workflow:` keys in same file
+- Same `SwarmSDK.load_file` API works for both types!
+
 ---
 
 ## Top-Level Fields
@@ -43,8 +73,10 @@ version: 2
 
 ### swarm
 
-**Type:** Object (required)
-**Description:** Root configuration object containing all swarm settings.
+**Type:** Object (required for Swarm type)
+**Description:** Root configuration object for multi-agent collaboration swarms. Use this key when you want agents to collaborate through delegation.
+
+**Mutually exclusive with:** `workflow:`
 
 ```yaml
 swarm:
@@ -56,9 +88,28 @@ swarm:
 
 ---
 
+### workflow
+
+**Type:** Object (required for Workflow type)
+**Description:** Root configuration object for multi-stage pipeline workflows. Use this key when you want to orchestrate agents through sequential or parallel nodes.
+
+**Mutually exclusive with:** `swarm:`
+
+```yaml
+workflow:
+  name: "Build Pipeline"
+  start_node: planning
+  agents:
+    # ...
+  nodes:
+    # ...
+```
+
+---
+
 ## Swarm Configuration
 
-Fields under the `swarm` key.
+Fields under the `swarm` key (for Swarm type configurations).
 
 ### id
 
@@ -224,25 +275,21 @@ swarm:
   scratchpad: enabled   # enable scratchpad
   scratchpad: disabled  # no scratchpad (default)
 
-# With nodes - shared across all nodes
-swarm:
+# Workflow - shared across all nodes
+workflow:
   scratchpad: enabled
-
+  start_node: planning
   nodes:
     planning: { ... }
     implementation: { ... }
 
-  start_node: planning
-
-# With nodes - isolated per node
-swarm:
+# Workflow - isolated per node
+workflow:
   scratchpad: per_node
-
+  start_node: planning
   nodes:
     planning: { ... }
     implementation: { ... }
-
-  start_node: planning
 ```
 
 ---
@@ -313,33 +360,44 @@ swarm:
 
 ### nodes
 
-**Type:** Object (optional)
+**Type:** Object (required for Workflow type)
 **Description:** Map of node names to node configurations. Enables multi-stage workflows with multiple execution stages.
 **Format:** `{ node_name: node_config }`
 
+**Important:** This field is only valid under the `workflow:` key, not `swarm:`.
+
 Nodes allow you to create workflows where different agent teams collaborate in sequence. Each node is an independent swarm execution that can receive input from previous nodes and pass output to subsequent nodes.
 
 **Example:**
 ```yaml
-nodes:
-  planning:
-    agents:
-      - agent: architect
-    output_command: "tee plan.txt"
+workflow:
+  name: "Build Pipeline"
+  start_node: planning
+  agents:
+    architect: { ... }
+    backend: { ... }
+    tester: { ... }
+    reviewer: { ... }
 
-  implementation:
-    agents:
-      - agent: backend
-        delegates_to: [tester]
-        tools: [Read, Edit, Write]  # Override tools for this node
-      - agent: tester
-    dependencies: [planning]
-    input_command: "cat plan.txt"
+  nodes:
+    planning:
+      agents:
+        - agent: architect
+      output_command: "tee plan.txt"
 
-  review:
-    agents:
-      - agent: reviewer
-    dependencies: [implementation]
+    implementation:
+      agents:
+        - agent: backend
+          delegates_to: [tester]
+          tools: [Read, Edit, Write]  # Override tools for this node
+        - agent: tester
+      dependencies: [planning]
+      input_command: "cat plan.txt"
+
+    review:
+      agents:
+        - agent: reviewer
+      dependencies: [implementation]
 ```
 
 **Node configuration fields:**
@@ -376,14 +434,16 @@ nodes:
 
 ### start_node
 
-**Type:** String (required if nodes defined)
+**Type:** String (required for Workflow type)
 **Description:** Name of the starting node for workflow execution.
 
+**Important:** This field is only valid under the `workflow:` key, not `swarm:`.
+
 **Example:**
 ```yaml
-swarm:
+workflow:
   name: "Dev Workflow"
-  lead: coordinator
+  start_node: planning  # Required: Start with planning node
   agents:
     coordinator:
       description: "Coordinator"
@@ -399,7 +459,6 @@ swarm:
       agents:
         - agent: backend
       dependencies: [planning]
-  start_node: planning  # Start with planning node
 ```
 
 ---
@@ -590,7 +649,7 @@ agents:
 - `ScratchpadWrite`, `ScratchpadRead`, `ScratchpadList`
 
 **Memory tools** (added if agent has `memory` configured):
-- `MemoryWrite`, `MemoryRead`, `MemoryEdit`, `MemoryMultiEdit`, `MemoryGlob`, `MemoryGrep`, `MemoryDelete`
+- `MemoryWrite`, `MemoryRead`, `MemoryEdit`, `MemoryGlob`, `MemoryGrep`, `MemoryDelete`
 
 **Additional tools:**
 - `Write`, `Edit`, `MultiEdit`, `Bash`
@@ -702,7 +761,7 @@ Plugin storage (like SwarmMemory) is always shared by base agent name:
 **Default:** `null` (memory disabled)
 **Description:** Configure persistent memory storage for this agent.
 
-When configured, the agent automatically gets all 7 memory tools (MemoryWrite, MemoryRead, MemoryEdit, MemoryMultiEdit, MemoryGlob, MemoryGrep, MemoryDelete) and a memory system prompt is appended.
+When configured, the agent automatically gets all 6 memory tools (MemoryWrite, MemoryRead, MemoryEdit, MemoryGlob, MemoryGrep, MemoryDelete) and a memory system prompt is appended.
 
 Memory is per-agent (isolated) and persistent (survives across sessions).
 
@@ -1583,7 +1642,7 @@ agents:
 
 ## Node Configuration
 
-Fields under each node in `swarm.nodes`.
+Fields under each node in `workflow.nodes`.
 
 ### agents
 
@@ -1904,7 +1963,11 @@ permissions:
 
 ---
 
-## Complete Example
+## Complete Examples
+
+### Complete Swarm Example
+
+A multi-agent collaboration swarm where agents delegate tasks to each other:
 
 ```yaml
 version: 2
@@ -2043,8 +2106,65 @@ swarm:
 
       parameters:
         temperature: 0.2
+```
+
+---
+
+### Complete Workflow Example
+
+A multi-stage pipeline workflow with sequential and parallel node execution:
+
+```yaml
+version: 2
+
+workflow:
+  name: "Development Pipeline"
+  start_node: planning
+
+  # Global configuration for all agents
+  all_agents:
+    provider: openai
+    timeout: 180
+    coding_agent: true
+
+  # Agent definitions (shared across nodes)
+  agents:
+    coordinator:
+      description: "Lead coordinator for planning"
+      model: gpt-5
+      system_prompt: "You create detailed project plans"
+      tools: [Read, TodoWrite]
+
+    backend:
+      description: "Backend developer specializing in Ruby on Rails"
+      model: claude-sonnet-4
+      provider: anthropic
+      directory: "backend"
+      system_prompt: "You build clean, testable backend APIs"
+      tools: [Read, Write, Edit, Bash]
+      delegates_to: [database]
 
-  # Multi-stage workflow
+    frontend:
+      description: "Frontend developer specializing in React"
+      model: gpt-5
+      directory: "frontend"
+      system_prompt: "You build modern, accessible frontends"
+      tools: [Read, Write, Edit, Bash]
+
+    database:
+      description: "Database expert for schema design"
+      model: gpt-5
+      directory: "backend"
+      system_prompt: "You design efficient database schemas"
+      tools: [Read, Write, Bash]
+
+    reviewer:
+      description: "Code reviewer checking for bugs"
+      model: o4
+      system_prompt: "You review code for quality and security"
+      tools: [Read, Grep, Glob]
+
+  # Multi-stage workflow nodes
   nodes:
     planning:
       agents:
@@ -2072,8 +2192,6 @@ swarm:
       dependencies: [backend_implementation, frontend_implementation]
       input_command: "scripts/gather-changes.sh"
       output_command: "scripts/format-review.sh"
-
-  start_node: planning
 ```
 
 ---

data/examples/snapshot_demo.rb

@@ -27,7 +27,7 @@ swarm = SwarmSDK.build do
   agent(:assistant) do
     provider("openai")
     model("claude-haiku-4-5")
-    base_url("https://proxy-shopify-ai.local.shop.dev/v1")
+    base_url("https://api.example.com/v1")
     description("Helpful assistant")
     system_prompt("You are a helpful assistant")
     tools(:Think)
@@ -77,7 +77,7 @@ swarm2 = SwarmSDK.build do
   agent(:assistant) do
     provider("openai")
     model("claude-haiku-4-5")
-    base_url("https://proxy-shopify-ai.local.shop.dev/v1")
+    base_url("https://api.example.com/v1")
     description("Helpful assistant")
     system_prompt("You are a helpful assistant")
     tools(:Think)

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"
@@ -136,7 +123,7 @@ module ClaudeSwarm
       # Add optional arguments
       # Handle prompt_file by reading the file contents
       if instance[:prompt_file]
-        prompt_file_path = File.join(@config.root_directory, instance[:prompt_file])
+        prompt_file_path = File.join(@config.base_dir, instance[:prompt_file])
         if File.exist?(prompt_file_path)
           prompt_content = File.read(prompt_file_path)
           args.push("--prompt", prompt_content)

data/lib/claude_swarm/orchestrator.rb

@@ -568,7 +568,14 @@ module ClaudeSwarm
       end
 
       # Always add instance prompt if it exists
-      if instance[:prompt]
+      if instance[:prompt_file]
+        prompt_file_path = File.join(@config.base_dir, instance[:prompt_file])
+        if File.exist?(prompt_file_path)
+          prompt_content = File.read(prompt_file_path)
+          parts << "--append-system-prompt"
+          parts << prompt_content
+        end
+      elsif instance[:prompt]
         parts << "--append-system-prompt"
         parts << instance[:prompt]
       end

data/lib/claude_swarm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClaudeSwarm
-  VERSION = "1.0.9"
+  VERSION = "1.0.11"
 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