claude_swarm 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f802dadf6aa3673a354582aed75d8887d8ff83c4d30d700eba89f7f3663eec9
-  data.tar.gz: a2aea35f422333fd2421d078bf336745c61172c900ac96da1d20d50100fef607
+  metadata.gz: 84d6a42818a51bc2b0d47519fb874d77875c23646559a0d8820087866cc1a6d4
+  data.tar.gz: 4f4b1a8cb570cab6c38a385e00d3155715f04a4b55f41fe87f0fb397caf0be6c
 SHA512:
-  metadata.gz: 7fb47e9059f561852a81411920dc0a0d568c5c47a2361823ee5425e3820ef21699c26072e1bf330fdfff4514b8fc3c182df59975266f3f62b5e89aeba31dd63a
-  data.tar.gz: dec84ec9eb8b0f95edb1d079fcc7ab155ed754713343f8730f68d248f28db1e9ad0571b734f885cbcc30fbda58a0cde077d5e7d18c960c5a9ad1e5c03df396a6
+  metadata.gz: 55fce00688afa714aa79897b008e885f600fb198b37e2bb2ba90563e57345ff922f448a86f2bde93409fdb4d5486fb763cfc1a27ba826b79106c55a92116a1e4
+  data.tar.gz: 8f9c58fbee771dec48c0c41fd13f078633120b686ecaa95517f95269e8796f8aaaf6d9ff54556edaa8389bda10a6a53bb45d1e0318ffc79027a7b6a7e848ef11

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+## [0.3.1]
+
+### Added
+- **Interactive mode with initial prompt**: Added `-i/--interactive` flag to provide an initial prompt for interactive mode
+  - Use `claude-swarm -i "Your initial prompt"` to start in interactive mode with a prompt
+  - Cannot be used together with `-p/--prompt` (which is for non-interactive mode)
+  - Allows users to provide context or initial instructions while maintaining interactive session
+
+### Fixed
+- **Development documentation**: Fixed `bundle exec` prefix in CLAUDE.md for development commands
+- **Bundler environment conflicts**: Fixed issue where Claude instances would inherit bundler environment variables, causing conflicts when working in Ruby projects
+  - MCP servers now receive necessary Ruby/Bundler environment variables to run properly
+  - Claude instances (main and connected) run in clean environments via `Bundler.with_unbundled_env`
+  - Prevents `bundle install` and other bundler commands from using Claude Swarm's Gemfile instead of the project's Gemfile
+  - `claude mcp serve` now runs with a filtered environment that excludes Ruby/Bundler variables while preserving system variables
+
+## [0.3.0]
+
+### Added
+- **Root directory parameter**: Added `--root-dir` option to the `start` command to enable running claude-swarm from any directory
+  - Use `claude-swarm start /path/to/config.yml --root-dir /path/to/project` to run from anywhere
+  - All relative paths in configuration files are resolved from the root directory
+  - Defaults to current directory when not specified, maintaining backward compatibility
+  - Environment variable `CLAUDE_SWARM_ROOT_DIR` is set and inherited by all child processes
+
+### Changed
+- **BREAKING CHANGE: Renamed session directory references**: Session metadata and file storage have been updated to use "root_directory" terminology
+  - Environment variable renamed from `CLAUDE_SWARM_START_DIR` to `CLAUDE_SWARM_ROOT_DIR`
+  - Session file renamed from `start_directory` to `root_directory`
+  - Session metadata field renamed from `"start_directory"` to `"root_directory"`
+  - Display text in `show` command changed from "Start Directory:" to "Root Directory:"
+- **Refactored root directory access**: Introduced `ClaudeSwarm.root_dir` method for cleaner code
+  - Centralizes root directory resolution logic
+  - Replaces repetitive `ENV.fetch` calls throughout the codebase
+
 ## [0.2.1]
 
 ### Added

data/CLAUDE.md

@@ -8,14 +8,9 @@ Claude Swarm is a Ruby gem that orchestrates multiple Claude Code instances as a
 
 ## Development Commands
 
-### Setup
-```bash
-bin/setup              # Install dependencies
-```
-
 ### Testing
 ```bash
-rake test             # Run the Minitest test suite
+bundle exec rake test             # Run the Minitest test suite
 ```
 
 **Important**: Tests should not generate any output to stdout or stderr. When writing tests:
@@ -37,7 +32,7 @@ end
 
 ### Linting
 ```bash
-rake rubocop -A       # Run RuboCop linter to auto fix problems
+bundle exec rubocop -A       # Run RuboCop linter to auto fix problems
 ```
 
 ### Development Console

data/README.md

@@ -1,6 +1,6 @@
 # Claude Swarm
 
-[![Gem Version](https://badge.fury.io/rb/claude_swarm.svg?cache_bust=0.2.0)](https://badge.fury.io/rb/claude_swarm)
+[![Gem Version](https://badge.fury.io/rb/claude_swarm.svg?cache_bust=0.3.0)](https://badge.fury.io/rb/claude_swarm)
 [![CI](https://github.com/parruda/claude-swarm/actions/workflows/ci.yml/badge.svg)](https://github.com/parruda/claude-swarm/actions/workflows/ci.yml)
 
 Claude Swarm orchestrates multiple Claude Code instances as a collaborative AI development team. It enables running AI agents with specialized roles, tools, and directory contexts, communicating via MCP (Model Context Protocol) in a tree-like hierarchy. Define your swarm topology in simple YAML and let Claude instances delegate tasks through connected instances. Perfect for complex projects requiring specialized AI agents for frontend, backend, testing, DevOps, or research tasks.
@@ -767,6 +767,10 @@ claude-swarm --vibe
 claude-swarm -p "Implement the new user authentication feature"
 claude-swarm --prompt "Fix the bug in the payment module"
 
+# Run in interactive mode with an initial prompt
+claude-swarm -i "Review the codebase and suggest improvements"
+claude-swarm --interactive "Help me debug this test failure"
+
 # Use a custom session ID instead of auto-generated UUID
 claude-swarm --session-id my-custom-session-123
 

data/lib/claude_swarm/claude_code_executor.rb

@@ -33,43 +33,48 @@ module ClaudeSwarm
       stderr_output = []
       result_response = nil
 
-      # Execute command with streaming
-      Open3.popen3(*cmd_array, chdir: @working_directory) do |stdin, stdout, stderr, wait_thread|
-        stdin.close
+      # Execute command with unbundled environment to avoid bundler conflicts
+      # This ensures claude runs in a clean environment without inheriting
+      # Claude Swarm's BUNDLE_* environment variables
+      Bundler.with_unbundled_env do
+        # Execute command with streaming
+        Open3.popen3(*cmd_array, chdir: @working_directory) do |stdin, stdout, stderr, wait_thread|
+          stdin.close
+
+          # Read stderr in a separate thread
+          stderr_thread = Thread.new do
+            stderr.each_line { |line| stderr_output << line }
+          end
 
-        # Read stderr in a separate thread
-        stderr_thread = Thread.new do
-          stderr.each_line { |line| stderr_output << line }
-        end
+          # Process stdout line by line
+          stdout.each_line do |line|
+            json_data = JSON.parse(line.strip)
 
-        # Process stdout line by line
-        stdout.each_line do |line|
-          json_data = JSON.parse(line.strip)
+            # Log each JSON event
+            log_streaming_event(json_data)
 
-          # Log each JSON event
-          log_streaming_event(json_data)
+            # Capture session_id from system init
+            if json_data["type"] == "system" && json_data["subtype"] == "init"
+              @session_id = json_data["session_id"]
+              write_instance_state
+            end
 
-          # Capture session_id from system init
-          if json_data["type"] == "system" && json_data["subtype"] == "init"
-            @session_id = json_data["session_id"]
-            write_instance_state
+            # Capture the final result
+            result_response = json_data if json_data["type"] == "result"
+          rescue JSON::ParserError => e
+            @logger.warn("Failed to parse JSON line: #{line.strip} - #{e.message}")
           end
 
-          # Capture the final result
-          result_response = json_data if json_data["type"] == "result"
-        rescue JSON::ParserError => e
-          @logger.warn("Failed to parse JSON line: #{line.strip} - #{e.message}")
-        end
+          # Wait for stderr thread to finish
+          stderr_thread.join
 
-        # Wait for stderr thread to finish
-        stderr_thread.join
-
-        # Check exit status
-        exit_status = wait_thread.value
-        unless exit_status.success?
-          error_msg = stderr_output.join
-          @logger.error("Execution error for #{@instance_name}: #{error_msg}")
-          raise ExecutionError, "Claude Code execution failed: #{error_msg}"
+          # Check exit status
+          exit_status = wait_thread.value
+          unless exit_status.success?
+            error_msg = stderr_output.join
+            @logger.error("Execution error for #{@instance_name}: #{error_msg}")
+            raise ExecutionError, "Claude Code execution failed: #{error_msg}"
+          end
         end
       end
 

data/lib/claude_swarm/cli.rb

@@ -18,6 +18,10 @@ module ClaudeSwarm
       aliases: "-p",
       type: :string,
       desc: "Prompt to pass to the main Claude instance (non-interactive mode)"
+    method_option :interactive,
+      aliases: "-i",
+      type: :string,
+      desc: "Initial prompt for interactive mode"
     method_option :stream_logs,
       type: :boolean,
       default: false,
@@ -34,6 +38,9 @@ module ClaudeSwarm
     method_option :session_id,
       type: :string,
       desc: "Use a specific session ID instead of generating one"
+    method_option :root_dir,
+      type: :string,
+      desc: "Root directory for resolving relative paths (defaults to current directory)"
     def start(config_file = nil)
       config_path = config_file || "claude-swarm.yml"
       unless File.exist?(config_path)
@@ -41,6 +48,10 @@ module ClaudeSwarm
         exit(1)
       end
 
+      # Set root directory early so it's available to all components
+      root_dir = options[:root_dir] || Dir.pwd
+      ENV["CLAUDE_SWARM_ROOT_DIR"] = File.expand_path(root_dir)
+
       say("Starting Claude Swarm from #{config_path}...") unless options[:prompt]
 
       # Validate stream_logs option
@@ -49,14 +60,21 @@ module ClaudeSwarm
         exit(1)
       end
 
+      # Validate conflicting options
+      if options[:prompt] && options[:interactive]
+        error("Cannot use both -p/--prompt and -i/--interactive")
+        exit(1)
+      end
+
       begin
-        config = Configuration.new(config_path, base_dir: Dir.pwd, options: options)
+        config = Configuration.new(config_path, base_dir: ClaudeSwarm.root_dir, options: options)
         generator = McpGenerator.new(config, vibe: options[:vibe])
         orchestrator = Orchestrator.new(
           config,
           generator,
           vibe: options[:vibe],
           prompt: options[:prompt],
+          interactive_prompt: options[:interactive],
           stream_logs: options[:stream_logs],
           debug: options[:debug],
           worktree: options[:worktree],
@@ -518,20 +536,24 @@ module ClaudeSwarm
           exit(1)
         end
 
-        # Change to the original start directory if it exists
-        start_dir_file = File.join(session_path, "start_directory")
-        if File.exist?(start_dir_file)
-          original_dir = File.read(start_dir_file).strip
+        # Change to the original root directory if it exists
+        root_dir_file = File.join(session_path, "root_directory")
+        if File.exist?(root_dir_file)
+          original_dir = File.read(root_dir_file).strip
           if Dir.exist?(original_dir)
             Dir.chdir(original_dir)
+            ENV["CLAUDE_SWARM_ROOT_DIR"] = original_dir
             say("Changed to original directory: #{original_dir}", :green) unless options[:prompt]
           else
             error("Original directory no longer exists: #{original_dir}")
             exit(1)
           end
+        else
+          # If no root_directory file, use current directory
+          ENV["CLAUDE_SWARM_ROOT_DIR"] = Dir.pwd
         end
 
-        config = Configuration.new(config_file, base_dir: Dir.pwd)
+        config = Configuration.new(config_file, base_dir: ClaudeSwarm.root_dir)
 
         # Load session metadata if it exists to check for worktree info
         session_metadata_file = File.join(session_path, "session_metadata.json")

data/lib/claude_swarm/commands/ps.rb

@@ -82,10 +82,10 @@ module ClaudeSwarm
         swarm_name = config.dig("swarm", "name") || "Unknown"
         main_instance = config.dig("swarm", "main")
 
-        # Get base directory from session metadata or start_directory file
-        base_dir = Dir.pwd
-        start_dir_file = File.join(session_dir, "start_directory")
-        base_dir = File.read(start_dir_file).strip if File.exist?(start_dir_file)
+        # Get base directory from session metadata or root_directory file
+        base_dir = ClaudeSwarm.root_dir
+        root_dir_file = File.join(session_dir, "root_directory")
+        base_dir = File.read(root_dir_file).strip if File.exist?(root_dir_file)
 
         # Get all directories - handle both string and array formats
         dir_config = config.dig("swarm", "instances", main_instance, "directory")

data/lib/claude_swarm/commands/show.rb

@@ -37,9 +37,9 @@ module ClaudeSwarm
 
         puts "Total Cost: #{cost_display}"
 
-        # Try to read start directory
-        start_dir_file = File.join(session_path, "start_directory")
-        puts "Start Directory: #{File.read(start_dir_file).strip}" if File.exist?(start_dir_file)
+        # Try to read root directory
+        root_dir_file = File.join(session_path, "root_directory")
+        puts "Root Directory: #{File.read(root_dir_file).strip}" if File.exist?(root_dir_file)
 
         puts
         puts "Instance Hierarchy:"

data/lib/claude_swarm/mcp_generator.rb

@@ -95,10 +95,21 @@ module ClaudeSwarm
     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
 
@@ -161,11 +172,45 @@ module ClaudeSwarm
         args.push("--claude-session-id", claude_session_id) if claude_session_id
       end
 
-      {
+      # Capture environment variables needed for Ruby and Bundler to work properly
+      # This includes both BUNDLE_* variables and Ruby-specific variables
+      required_env = {}
+
+      # Bundle-specific variables
+      ENV.each do |k, v|
+        required_env[k] = v if k.start_with?("BUNDLE_")
+      end
+
+      # Claude Swarm-specific variables
+      ENV.each do |k, v|
+        required_env[k] = v if k.start_with?("CLAUDE_SWARM_")
+      end
+
+      # Ruby-specific variables that MCP servers need
+      [
+        "RUBY_ROOT",
+        "RUBY_ENGINE",
+        "RUBY_VERSION",
+        "GEM_ROOT",
+        "GEM_HOME",
+        "GEM_PATH",
+        "RUBYOPT",
+        "RUBYLIB",
+        "PATH",
+      ].each do |key|
+        required_env[key] = ENV[key] if ENV[key]
+      end
+
+      config = {
         "type" => "stdio",
         "command" => exe_path,
         "args" => args,
       }
+
+      # Add required environment variables if any exist
+      config["env"] = required_env unless required_env.empty?
+
+      config
     end
 
     def load_instance_states

data/lib/claude_swarm/openai/executor.rb

@@ -168,10 +168,12 @@ module ClaudeSwarm
               command_array = [server_config["command"]]
               command_array.concat(server_config["args"] || [])
 
-              mcp_configs << MCPClient.stdio_config(
+              stdio_config = MCPClient.stdio_config(
                 command: command_array,
                 name: name,
               )
+              stdio_config[:read_timeout] = 1800
+              mcp_configs << stdio_config
             when "sse"
               @logger.warn("SSE MCP servers not yet supported for OpenAI instances: #{name}")
               # TODO: Add SSE support when available in ruby-mcp-client
@@ -179,18 +181,23 @@ module ClaudeSwarm
           end
 
           if mcp_configs.any?
-            @mcp_client = MCPClient.create_client(
-              mcp_server_configs: mcp_configs,
-              logger: @logger,
-            )
-
-            # List available tools from all MCP servers
-            begin
-              @available_tools = @mcp_client.list_tools
-              @logger.info("Loaded #{@available_tools.size} tools from #{mcp_configs.size} MCP server(s)")
-            rescue StandardError => e
-              @logger.error("Failed to load MCP tools: #{e.message}")
-              @available_tools = []
+            # Create MCP client with unbundled environment to avoid bundler conflicts
+            # This ensures MCP servers run in a clean environment without inheriting
+            # Claude Swarm's BUNDLE_* environment variables
+            Bundler.with_unbundled_env do
+              @mcp_client = MCPClient.create_client(
+                mcp_server_configs: mcp_configs,
+                logger: @logger,
+              )
+
+              # List available tools from all MCP servers
+              begin
+                @available_tools = @mcp_client.list_tools
+                @logger.info("Loaded #{@available_tools.size} tools from #{mcp_configs.size} MCP server(s)")
+              rescue StandardError => e
+                @logger.error("Failed to load MCP tools: #{e.message}")
+                @available_tools = []
+              end
             end
           end
         end