claude_swarm 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37bc8baf6ea837fcd1e8936a1ae5a6a13138fad6e6efb3708deca991673e119d
-  data.tar.gz: 1e3d06c4138a42e7ab54a121c4bd3e584db3859e640a5965aac88d04fe0e6132
+  metadata.gz: 8d82adc5c9d855904f9809e4e2c8d9e34b7dbd5b2dd6ebec98e4072d6c81f3cf
+  data.tar.gz: 1faa01211ebe1b05fcc0dbf8b654b77e3512b4a4653b9169ef8c1b1e40226680
 SHA512:
-  metadata.gz: dba5aab927293d3cc5fc4190b0cd84f7addf7ae0f90224df425a166d33c5feb5e062be21c8b915589191a14609f25f6fc68da63402c5295588bd5c4ed1d177ab
-  data.tar.gz: 6a7d5058d8583bd1bf6fec8d148fe62e617535528f49f960412eb6da065db01a0405f4de6cff8963c63c523ce81cbf661dc49fe8840df3d568eaa2fcba853284
+  metadata.gz: 539f27f040ff91900bd8d88f925564f07ee4ad673eaaadcfdda228e44ca21adfd46a8be3dd40ae3a9b267b15ac5df4a5bd154d855f75ef85f1888522b71a716b
+  data.tar.gz: 81c0d46bf825684597d80271e7b0e7480b8c92e80c2465af1513b6d80f4dea2100b173261311243f5514e4aeb07bbdedebc0467b293415647bd8397161f98e8d

data/CHANGELOG.md

@@ -1,4 +1,15 @@
-## [Unreleased]
+## [0.1.3]
+
+### Fixed
+- Fixed duplicate prompt arguments being passed to Claude Code executor, which could cause command execution failures
+
+### Changed
+- Improved logging to track request flow between instances using `from_instance` and `to_instance` fields instead of generic `instance_name`
+- Added required `calling_instance` parameter to MCP server command to properly identify the source of requests in tree configurations
+- Consolidated session files into a single directory structure (`.claude-swarm/sessions/<timestamp>/`)
+- MCP configuration files are now stored alongside session logs in the same timestamped directory
+- Session logs are now named `session.log` instead of `session_<timestamp>.log`
+- Improved organization by keeping all session-related files together
 
 ## [0.1.2] - 2025-05-29
 

data/README.md

@@ -77,7 +77,7 @@ claude-swarm --vibe # That will allow ALL tools for all instances! Be Careful!
 This will:
 - Launch the main instance (lead) with connections to other instances
 - The lead instance can communicate with the other instances via MCP
-- All instances log to `.claude-swarm/logs/session-{timestamp}/`
+- All session files are stored in `.claude-swarm/sessions/{timestamp}/`
 
 #### Multi-Level Swarm Example
 
@@ -400,7 +400,9 @@ claude-swarm mcp-serve INSTANCE_NAME --config CONFIG_FILE --session-timestamp TI
    - **task**: Execute tasks using Claude Code with configurable tools and return results
    - **session_info**: Get current Claude session information including ID and working directory
    - **reset_session**: Reset the Claude session for a fresh start
-6. **Centralized Logging**: All instances log to `.claude-swarm/logs/session-{timestamp}/` with detailed request/response tracking
+6. **Session Management**: All session files are organized in `.claude-swarm/sessions/{timestamp}/`:
+   - MCP configuration files: `{instance_name}.mcp.json`
+   - Session log: `session.log` with detailed request/response tracking
 
 ## Troubleshooting
 
@@ -423,16 +425,16 @@ claude-swarm mcp-serve INSTANCE_NAME --config CONFIG_FILE --session-timestamp TI
 ### Debug Output
 
 The swarm will display:
-- Generated MCP configuration location
+- Session directory location (`.claude-swarm/sessions/{timestamp}/`)
 - Main instance details (model, directory, tools, connections)
 - The exact command being run
 
-### Logs
+### Session Files
 
-Check the centralized logs in `.claude-swarm/logs/session-{timestamp}/` for:
-- Individual instance logs
-- MCP server communication
-- Error messages and debugging information
+Check the session directory `.claude-swarm/sessions/{timestamp}/` for:
+- `session.log`: Detailed logs with request/response tracking
+- `{instance}.mcp.json`: MCP configuration for each instance
+- All files for a session are kept together for easy review
 
 ## Architecture
 

data/claude-swarm.yml

@@ -17,3 +17,10 @@ swarm:
       model: sonnet
       prompt: "You specialize in frontend development with React, TypeScript, and modern web technologies"
       tools: [Read, Edit, Write, "Bash(npm:*)", "Bash(yarn:*)", "Bash(pnpm:*)"]
+      connections: [css_dev]
+
+    css_dev:
+      directory: .
+      model: sonnet
+      prompt: "You specialize in CSS development with Tailwind CSS, CSS Modules, and modern web technologies"
+      tools: [Read, Edit, Write, "Bash(npm:*)", "Bash(yarn:*)", "Bash(pnpm:*)"]

data/lib/claude_swarm/claude_code_executor.rb

@@ -67,8 +67,8 @@ module ClaudeSwarm
       # Always use JSON output format for structured responses
       cmd_array += ["--output-format", "json"]
 
-      # Add non-interactive mode
-      cmd_array << "--print"
+      # Add non-interactive mode with prompt
+      cmd_array += ["--print", "-p", prompt]
 
       # Add any custom system prompt
       cmd_array += ["--system-prompt", options[:system_prompt]] if options[:system_prompt]
@@ -81,9 +81,6 @@ module ClaudeSwarm
         cmd_array += ["--allowedTools", tools]
       end
 
-      # Add the prompt as the last argument (no escaping needed with array syntax)
-      cmd_array << prompt
-
       cmd_array
     end
 

data/lib/claude_swarm/claude_mcp_server.rb

@@ -9,15 +9,16 @@ require_relative "claude_code_executor"
 module ClaudeSwarm
   class ClaudeMcpServer
     SWARM_DIR = ".claude-swarm"
-    LOGS_DIR = "logs"
+    SESSIONS_DIR = "sessions"
 
     # Class variables to share state with tool classes
     class << self
-      attr_accessor :executor, :instance_config, :logger, :session_timestamp
+      attr_accessor :executor, :instance_config, :logger, :session_timestamp, :calling_instance
     end
 
-    def initialize(instance_config)
+    def initialize(instance_config, calling_instance:)
       @instance_config = instance_config
+      @calling_instance = calling_instance
       @executor = ClaudeCodeExecutor.new(
         working_directory: instance_config[:directory],
         model: instance_config[:model],
@@ -32,6 +33,7 @@ module ClaudeSwarm
       self.class.executor = @executor
       self.class.instance_config = @instance_config
       self.class.logger = @logger
+      self.class.calling_instance = @calling_instance
     end
 
     private
@@ -41,13 +43,13 @@ module ClaudeSwarm
       # Otherwise create a new timestamp
       self.class.session_timestamp ||= ENV["CLAUDE_SWARM_SESSION_TIMESTAMP"] || Time.now.strftime("%Y%m%d_%H%M%S")
 
-      # Ensure the logs directory exists
-      logs_dir = File.join(Dir.pwd, SWARM_DIR, LOGS_DIR)
-      FileUtils.mkdir_p(logs_dir)
+      # Ensure the session directory exists
+      session_dir = File.join(Dir.pwd, SWARM_DIR, SESSIONS_DIR, self.class.session_timestamp)
+      FileUtils.mkdir_p(session_dir)
 
-      # Create logger with timestamped filename
-      log_filename = "session_#{self.class.session_timestamp}.log"
-      log_path = File.join(logs_dir, log_filename)
+      # Create logger with session.log filename
+      log_filename = "session.log"
+      log_path = File.join(session_dir, log_filename)
       @logger = Logger.new(log_path)
       @logger.level = Logger::INFO
 
@@ -103,7 +105,8 @@ module ClaudeSwarm
           # Log the request
           log_entry = {
             timestamp: Time.now.utc.iso8601,
-            instance_name: instance_config[:name],
+            from_instance: ClaudeMcpServer.calling_instance, # The instance making the request
+            to_instance: instance_config[:name], # This instance is receiving the request
             model: instance_config[:model],
             working_directory: instance_config[:directory],
             session_id: executor.session_id,
@@ -120,7 +123,10 @@ module ClaudeSwarm
           response = executor.execute(prompt, options)
 
           # Log the response
-          response_entry = log_entry.merge(
+          response_entry = {
+            timestamp: Time.now.utc.iso8601,
+            from_instance: instance_config[:name], # This instance is sending the response
+            to_instance: ClaudeMcpServer.calling_instance, # The instance that made the request receives the response
             session_id: executor.session_id, # Update with new session ID if changed
             response: {
               result: response["result"],
@@ -129,7 +135,7 @@ module ClaudeSwarm
               is_error: response["is_error"],
               total_cost: response["total_cost"]
             }
-          )
+          }
 
           logger.info("RESPONSE: #{JSON.pretty_generate(response_entry)}")
 

data/lib/claude_swarm/cli.rb

@@ -29,8 +29,12 @@ module ClaudeSwarm
       say "Starting Claude Swarm from #{config_path}..." unless options[:prompt]
       begin
         config = Configuration.new(config_path)
-        generator = McpGenerator.new(config, vibe: options[:vibe])
-        orchestrator = Orchestrator.new(config, generator, vibe: options[:vibe], prompt: options[:prompt])
+        session_timestamp = Time.now.strftime("%Y%m%d_%H%M%S")
+        generator = McpGenerator.new(config, vibe: options[:vibe], timestamp: session_timestamp)
+        orchestrator = Orchestrator.new(config, generator,
+                                        vibe: options[:vibe],
+                                        prompt: options[:prompt],
+                                        session_timestamp: session_timestamp)
         orchestrator.start
       rescue Error => e
         error e.message
@@ -59,6 +63,8 @@ module ClaudeSwarm
                           desc: "Enable debug output"
     method_option :vibe, type: :boolean, default: false,
                          desc: "Run with --dangerously-skip-permissions"
+    method_option :calling_instance, type: :string, required: true,
+                                     desc: "Name of the instance that launched this MCP server"
     def mcp_serve
       instance_config = {
         name: options[:name],
@@ -71,7 +77,7 @@ module ClaudeSwarm
       }
 
       begin
-        server = ClaudeMcpServer.new(instance_config)
+        server = ClaudeMcpServer.new(instance_config, calling_instance: options[:calling_instance])
         server.start
       rescue StandardError => e
         error "Error starting MCP server: #{e.message}"

data/lib/claude_swarm/mcp_generator.rb

@@ -7,10 +7,12 @@ require "shellwords"
 module ClaudeSwarm
   class McpGenerator
     SWARM_DIR = ".claude-swarm"
+    SESSIONS_SUBDIR = "sessions"
 
-    def initialize(configuration, vibe: false)
+    def initialize(configuration, vibe: false, timestamp: nil)
       @config = configuration
       @vibe = vibe
+      @timestamp = timestamp || Time.now.strftime("%Y%m%d_%H%M%S")
     end
 
     def generate_all
@@ -22,7 +24,7 @@ module ClaudeSwarm
     end
 
     def mcp_config_path(instance_name)
-      File.join(Dir.pwd, SWARM_DIR, "#{instance_name}.mcp.json")
+      File.join(Dir.pwd, SWARM_DIR, SESSIONS_SUBDIR, @timestamp, "#{instance_name}.mcp.json")
     end
 
     private
@@ -34,9 +36,9 @@ module ClaudeSwarm
     def ensure_swarm_directory
       FileUtils.mkdir_p(swarm_dir)
 
-      # Create logs directory as well
-      logs_dir = File.join(swarm_dir, "logs")
-      FileUtils.mkdir_p(logs_dir)
+      # Create session directory with timestamp
+      session_dir = File.join(swarm_dir, SESSIONS_SUBDIR, @timestamp)
+      FileUtils.mkdir_p(session_dir)
 
       gitignore_path = File.join(swarm_dir, ".gitignore")
       File.write(gitignore_path, "*\n") unless File.exist?(gitignore_path)
@@ -53,7 +55,7 @@ module ClaudeSwarm
       # Add connection MCPs for other instances
       instance[:connections].each do |connection_name|
         connected_instance = @config.instances[connection_name]
-        mcp_servers[connection_name] = build_instance_mcp_config(connection_name, connected_instance)
+        mcp_servers[connection_name] = build_instance_mcp_config(connection_name, connected_instance, calling_instance: name)
       end
 
       config = {
@@ -81,7 +83,7 @@ module ClaudeSwarm
       end
     end
 
-    def build_instance_mcp_config(name, instance)
+    def build_instance_mcp_config(name, instance, calling_instance:)
       # Get the path to the claude-swarm executable
       exe_path = "claude-swarm"
 
@@ -100,6 +102,8 @@ module ClaudeSwarm
 
       args.push("--mcp-config-path", mcp_config_path(name))
 
+      args.push("--calling-instance", calling_instance) if calling_instance
+
       args.push("--vibe") if @vibe
 
       {

data/lib/claude_swarm/orchestrator.rb

@@ -4,11 +4,12 @@ require "shellwords"
 
 module ClaudeSwarm
   class Orchestrator
-    def initialize(configuration, mcp_generator, vibe: false, prompt: nil)
+    def initialize(configuration, mcp_generator, vibe: false, prompt: nil, session_timestamp: nil)
       @config = configuration
       @generator = mcp_generator
       @vibe = vibe
       @prompt = prompt
+      @session_timestamp = session_timestamp || Time.now.strftime("%Y%m%d_%H%M%S")
     end
 
     def start
@@ -18,18 +19,17 @@ module ClaudeSwarm
         puts
       end
 
-      # Set session timestamp for all instances to share the same log file
-      session_timestamp = Time.now.strftime("%Y%m%d_%H%M%S")
-      ENV["CLAUDE_SWARM_SESSION_TIMESTAMP"] = session_timestamp
+      # Set session timestamp for all instances to share the same session directory
+      ENV["CLAUDE_SWARM_SESSION_TIMESTAMP"] = @session_timestamp
       unless @prompt
-        puts "📝 Session logs will be saved to: .claude-swarm/logs/session_#{session_timestamp}.log"
+        puts "📝 Session files will be saved to: .claude-swarm/sessions/#{@session_timestamp}/"
         puts
       end
 
       # Generate all MCP configuration files
       @generator.generate_all
       unless @prompt
-        puts "✓ Generated MCP configurations in .claude-swarm/"
+        puts "✓ Generated MCP configurations in session directory"
         puts
       end
 

data/lib/claude_swarm/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: claude_swarm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Paulo Arruda
 bindir: exe
 cert_chain: []
-date: 2025-05-29 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor