claude_swarm 0.3.11 → 1.0.1

data/lib/claude_swarm/orchestrator.rb

@@ -6,7 +6,6 @@ module ClaudeSwarm
 
     attr_reader :config, :session_path, :session_log_path
 
-    RUN_DIR = File.expand_path("~/.claude-swarm/run")
     ["INT", "TERM", "QUIT"].each do |signal|
       Signal.trap(signal) do
         puts "\n🛑 Received #{signal} signal."
@@ -201,15 +200,29 @@ module ClaudeSwarm
       main_pid_file = File.join(@session_path, "main_pid")
       File.write(main_pid_file, Process.pid.to_s)
 
-      # Execute the main instance - this will cascade to other instances via MCP
-      Dir.chdir(main_instance[:directory]) do
-        # Execute before commands if specified
-        before_commands = @config.before_commands
-        if before_commands.any? && !@restore_session_path
-          non_interactive_output do
-            puts "⚙️  Executing before commands..."
-          end
+      # Execute before commands if specified
+      # If the main instance directory exists, run in it for backward compatibility
+      # If it doesn't exist, run in the parent directory so before commands can create it
+      before_commands = @config.before_commands
+      if before_commands.any? && !@restore_session_path
+        non_interactive_output do
+          puts "⚙️  Executing before commands..."
+        end
+
+        # Determine where to run before commands
+        if File.exist?(main_instance[:directory])
+          # Directory exists, run commands in it (backward compatibility)
+          before_commands_dir = main_instance[:directory]
+        else
+          # Directory doesn't exist, run in parent directory
+          # This allows before commands to create the directory
+          parent_dir = File.dirname(File.expand_path(main_instance[:directory]))
+          # Ensure parent directory exists (important for worktrees)
+          FileUtils.mkdir_p(parent_dir)
+          before_commands_dir = parent_dir
+        end
 
+        Dir.chdir(before_commands_dir) do
           success = execute_before_commands?(before_commands)
           unless success
             non_interactive_output { print("❌ Before commands failed. Aborting swarm launch.") }
@@ -218,26 +231,29 @@ module ClaudeSwarm
             cleanup_worktrees
             exit(1)
           end
+        end
 
-          non_interactive_output do
-            puts "✓ Before commands completed successfully"
-          end
+        non_interactive_output do
+          puts "✓ Before commands completed successfully"
+        end
 
-          # Validate directories after before commands have run
-          begin
-            @config.validate_directories
-            non_interactive_output do
-              puts "✓ All directories validated successfully"
-            end
-          rescue ClaudeSwarm::Error => e
-            non_interactive_output { print("❌ Directory validation failed: #{e.message}") }
-            cleanup_processes
-            cleanup_run_symlink
-            cleanup_worktrees
-            exit(1)
+        # Validate directories after before commands have run
+        begin
+          @config.validate_directories
+          non_interactive_output do
+            puts "✓ All directories validated successfully"
           end
+        rescue ClaudeSwarm::Error => e
+          non_interactive_output { print("❌ Directory validation failed: #{e.message}") }
+          cleanup_processes
+          cleanup_run_symlink
+          cleanup_worktrees
+          exit(1)
         end
+      end
 
+      # Execute the main instance - this will cascade to other instances via MCP
+      Dir.chdir(main_instance[:directory]) do
         # Execute main Claude instance with unbundled environment to avoid bundler conflicts
         # This ensures the main instance runs in a clean environment without inheriting
         # Claude Swarm's BUNDLE_* environment variables
@@ -263,9 +279,20 @@ module ClaudeSwarm
       display_summary
 
       # Execute after commands if specified
+      # Use the same logic as before commands for consistency
       after_commands = @config.after_commands
       if after_commands.any? && !@restore_session_path
-        Dir.chdir(main_instance[:directory]) do
+        # Determine where to run after commands (same logic as before commands)
+        if File.exist?(main_instance[:directory])
+          # Directory exists, run commands in it
+          after_commands_dir = main_instance[:directory]
+        else
+          # Directory doesn't exist (shouldn't happen after main instance runs, but be safe)
+          parent_dir = File.dirname(File.expand_path(main_instance[:directory]))
+          after_commands_dir = parent_dir
+        end
+
+        Dir.chdir(after_commands_dir) do
           non_interactive_output do
             print("⚙️  Executing after commands...")
           end
@@ -311,7 +338,7 @@ module ClaudeSwarm
 
       # Save session metadata
       metadata_file = File.join(session_path, "session_metadata.json")
-      File.write(metadata_file, JSON.pretty_generate(build_session_metadata))
+      JsonHandler.write_file!(metadata_file, build_session_metadata)
     end
 
     def build_session_metadata
@@ -367,11 +394,11 @@ module ClaudeSwarm
       metadata_file = File.join(@session_path, "session_metadata.json")
       return unless File.exist?(metadata_file)
 
-      metadata = JSON.parse(File.read(metadata_file))
+      metadata = JsonHandler.parse_file!(metadata_file)
       metadata["end_time"] = end_time.utc.iso8601
       metadata["duration_seconds"] = (end_time - @start_time).to_i
 
-      File.write(metadata_file, JSON.pretty_generate(metadata))
+      JsonHandler.write_file!(metadata_file, metadata)
     rescue StandardError => e
       non_interactive_output { print("⚠️  Error updating session metadata: #{e.message}") }
     end
@@ -409,11 +436,12 @@ module ClaudeSwarm
     def create_run_symlink
       return unless @session_path
 
-      FileUtils.mkdir_p(RUN_DIR)
+      run_dir = ClaudeSwarm.joined_run_dir
+      FileUtils.mkdir_p(run_dir)
 
       # Session ID is the last part of the session path
       session_id = File.basename(@session_path)
-      symlink_path = File.join(RUN_DIR, session_id)
+      symlink_path = ClaudeSwarm.joined_run_dir(session_id)
 
       # Remove stale symlink if exists
       File.unlink(symlink_path) if File.symlink?(symlink_path)
@@ -429,7 +457,7 @@ module ClaudeSwarm
       return unless @session_path
 
       session_id = File.basename(@session_path)
-      symlink_path = File.join(RUN_DIR, session_id)
+      symlink_path = ClaudeSwarm.joined_run_dir(session_id)
       File.unlink(symlink_path) if File.symlink?(symlink_path)
     rescue StandardError
       # Ignore errors during cleanup
@@ -484,7 +512,7 @@ module ClaudeSwarm
 
         # Find the state file for the main instance
         state_files.each do |state_file|
-          state_data = JSON.parse(File.read(state_file))
+          state_data = JsonHandler.parse_file!(state_file)
           next unless state_data["instance_name"] == main_instance_name
 
           claude_session_id = state_data["claude_session_id"]
@@ -569,7 +597,7 @@ module ClaudeSwarm
       metadata_file = File.join(session_path, "session_metadata.json")
       return unless File.exist?(metadata_file)
 
-      metadata = JSON.parse(File.read(metadata_file))
+      metadata = JsonHandler.parse_file!(metadata_file)
       worktree_data = metadata["worktree"]
       return unless worktree_data && worktree_data["enabled"]
 
@@ -601,13 +629,11 @@ module ClaudeSwarm
 
         # Read and process the merged output
         stdout_and_stderr.each_line do |line|
-          # Try to parse and prettify JSON lines
-
-          json_data = JSON.parse(line.chomp)
-          pretty_json = JSON.pretty_generate(json_data)
-          logger.info { pretty_json }
-        rescue JSON::ParserError
-          logger.info { line.chomp }
+          logger.info do
+            chomped_line = line.chomp
+            json_data = JsonHandler.parse(chomped_line)
+            json_data == chomped_line ? chomped_line : JsonHandler.pretty_generate!(json_data)
+          end
         end
 
         wait_thr.value
@@ -636,11 +662,11 @@ module ClaudeSwarm
             line = file.gets
             if line
               begin
-                # Parse JSONL entry
-                transcript_entry = JSON.parse(line)
+                # Parse JSONL entry, silently skip unparseable lines
+                transcript_entry = JsonHandler.parse(line)
 
-                # Skip summary entries - these are just conversation titles
-                next if transcript_entry["type"] == "summary"
+                # Skip if parsing failed or if it's a summary entry
+                next if transcript_entry == line || transcript_entry["type"] == "summary"
 
                 # Convert to session.log.json format
                 session_entry = convert_transcript_to_session_format(transcript_entry)
@@ -654,8 +680,6 @@ module ClaudeSwarm
                     log_file.puts(session_entry.to_json)
                   end
                 end
-              rescue JSON::ParserError
-                # Silently skip unparseable lines
               rescue StandardError
                 # Silently handle other errors to keep thread running
               end

data/lib/claude_swarm/session_cost_calculator.rb

@@ -86,7 +86,9 @@ module ClaudeSwarm
       main_instance_cost = 0.0
 
       File.foreach(session_log_path) do |line|
-        data = JSON.parse(line)
+        data = JsonHandler.parse(line)
+        next if data == line # Skip unparseable lines
+
         instance_name = data["instance"]
         instance_id = data["instance_id"]
 
@@ -108,8 +110,6 @@ module ClaudeSwarm
             instance_costs[instance_name] += cost
           end
         end
-      rescue JSON::ParserError
-        next
       end
 
       # Calculate total: sum of all instance costs + main instance token costs
@@ -137,7 +137,9 @@ module ClaudeSwarm
       return instances unless File.exist?(session_log_path)
 
       File.foreach(session_log_path) do |line|
-        data = JSON.parse(line)
+        data = JsonHandler.parse(line)
+        next if data == line # Skip unparseable lines
+
         instance_name = data["instance"]
         instance_id = data["instance_id"]
         calling_instance = data["calling_instance"]
@@ -191,8 +193,6 @@ module ClaudeSwarm
             instances[instance_name][:has_cost_data] = true
           end
         end
-      rescue JSON::ParserError
-        next
       end
 
       # Set main instance costs (replace, don't add)

data/lib/claude_swarm/session_path.rb

@@ -2,13 +2,7 @@
 
 module ClaudeSwarm
   module SessionPath
-    SESSIONS_DIR = "sessions"
-
     class << self
-      def swarm_home
-        ENV["CLAUDE_SWARM_HOME"] || File.expand_path("~/.claude-swarm")
-      end
-
       # Convert a directory path to a safe folder name using + as separator
       def project_folder_name(working_dir = Dir.pwd)
         # Don't expand path if it's already expanded (avoids double expansion on Windows)
@@ -27,7 +21,7 @@ module ClaudeSwarm
       # Generate a full session path for a given directory and session ID
       def generate(working_dir: Dir.pwd, session_id: SecureRandom.uuid)
         project_name = project_folder_name(working_dir)
-        File.join(swarm_home, SESSIONS_DIR, project_name, session_id)
+        ClaudeSwarm.joined_sessions_dir(project_name, session_id)
       end
 
       # Ensure the session directory exists
@@ -35,7 +29,7 @@ module ClaudeSwarm
         FileUtils.mkdir_p(session_path)
 
         # Add .gitignore to swarm home if it doesn't exist
-        gitignore_path = File.join(swarm_home, ".gitignore")
+        gitignore_path = ClaudeSwarm.joined_home_dir(".gitignore")
         File.write(gitignore_path, "*\n") unless File.exist?(gitignore_path)
       end
 

data/lib/claude_swarm/settings_generator.rb

@@ -54,7 +54,7 @@ module ClaudeSwarm
       return if settings.empty?
 
       # Write settings file
-      File.write(settings_path(name), JSON.pretty_generate(settings))
+      JsonHandler.write_file!(settings_path(name), settings)
     end
 
     def build_session_start_hook

data/lib/claude_swarm/templates/generation_prompt.md.erb

@@ -225,3 +225,6 @@ The more precisely you explain what you want, the better Claude's response will
 * **Provide instructions as sequential steps:** Use numbered lists or bullet points to better ensure that Claude carries out the task the exact way you want it to.
 
 </prompt_best_practices>
+
+
+IMPORTANT: Do not generate swarms with circular dependencies. For example, instance A connections to instance B, and instance B connections to instance A.

data/lib/claude_swarm/tools/task_tool.rb

@@ -43,8 +43,20 @@ module ClaudeSwarm
 
         response = executor.execute(final_prompt, options)
 
+        # Validate the response has a result
+        unless response.is_a?(Hash) && response.key?("result")
+          raise "Invalid response from executor: missing 'result' field. Response structure: #{response.keys.join(", ")}"
+        end
+
+        result = response["result"]
+
+        # Validate the result is not empty
+        if result.nil? || (result.is_a?(String) && result.strip.empty?)
+          raise "Agent #{instance_config[:name]} returned an empty response. The task was executed but no content was provided."
+        end
+
         # Return just the result text as expected by MCP
-        response["result"]
+        result
       end
     end
   end

data/lib/claude_swarm/version.rb

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

data/lib/claude_swarm/worktree_manager.rb

@@ -158,7 +158,7 @@ module ClaudeSwarm
       # Remove session-specific worktree directory if it exists and is empty
       return unless @session_id
 
-      session_worktree_dir = File.join(File.expand_path("~/.claude-swarm/worktrees"), @session_id)
+      session_worktree_dir = ClaudeSwarm.joined_worktrees_dir(@session_id)
       return unless File.exist?(session_worktree_dir)
 
       # Try to remove the directory tree
@@ -214,7 +214,7 @@ module ClaudeSwarm
       unique_repo_name = "#{repo_name}-#{path_hash}"
 
       # Build external path: ~/.claude-swarm/worktrees/[session_id]/[repo_name-hash]/[worktree_name]
-      base_dir = File.expand_path("~/.claude-swarm/worktrees")
+      base_dir = ClaudeSwarm.joined_worktrees_dir
 
       # Validate base directory is accessible
       begin

data/lib/claude_swarm.rb

@@ -22,7 +22,7 @@ require "yaml"
 
 # External dependencies
 require "claude_sdk"
-require "fast_mcp_annotations"
+require "fast_mcp"
 require "mcp_client"
 require "thor"
 
@@ -41,7 +41,27 @@ module ClaudeSwarm
 
   class << self
     def root_dir
-      ENV.fetch("CLAUDE_SWARM_ROOT_DIR", Dir.pwd)
+      ENV.fetch("CLAUDE_SWARM_ROOT_DIR") { Dir.pwd }
+    end
+
+    def home_dir
+      ENV.fetch("CLAUDE_SWARM_HOME") { File.expand_path("~/.claude-swarm") }
+    end
+
+    def joined_home_dir(*strings)
+      File.join(home_dir, *strings)
+    end
+
+    def joined_run_dir(*strings)
+      joined_home_dir("run", *strings)
+    end
+
+    def joined_sessions_dir(*strings)
+      joined_home_dir("sessions", *strings)
+    end
+
+    def joined_worktrees_dir(*strings)
+      joined_home_dir("worktrees", *strings)
     end
   end
 end