claude_swarm 0.1.19 → 0.2.0

data/lib/claude_swarm/orchestrator.rb

@@ -1,19 +1,12 @@
 # frozen_string_literal: true
 
-require "English"
-require "shellwords"
-require "json"
-require "fileutils"
-require_relative "session_path"
-require_relative "process_tracker"
-require_relative "worktree_manager"
-
 module ClaudeSwarm
   class Orchestrator
+    include SystemUtils
     RUN_DIR = File.expand_path("~/.claude-swarm/run")
 
     def initialize(configuration, mcp_generator, vibe: false, prompt: nil, stream_logs: false, debug: false,
-                   restore_session_path: nil, worktree: nil)
+      restore_session_path: nil, worktree: nil, session_id: nil)
       @config = configuration
       @generator = mcp_generator
       @vibe = vibe
@@ -22,18 +15,24 @@ module ClaudeSwarm
       @debug = debug
       @restore_session_path = restore_session_path
       @session_path = nil
+      @provided_session_id = session_id
       # Store worktree option for later use
       @worktree_option = worktree
       @needs_worktree_manager = worktree.is_a?(String) || worktree == "" ||
-                                configuration.instances.values.any? { |inst| !inst[:worktree].nil? }
+        configuration.instances.values.any? { |inst| !inst[:worktree].nil? }
       # Store modified instances after worktree setup
       @modified_instances = nil
+      # Track start time for runtime calculation
+      @start_time = nil
 
       # Set environment variable for prompt mode to suppress output
       ENV["CLAUDE_SWARM_PROMPT"] = "1" if @prompt
     end
 
     def start
+      # Track start time
+      @start_time = Time.now
+
       if @restore_session_path
         unless @prompt
           puts "🔄 Restoring Claude Swarm: #{@config.swarm_name}"
@@ -78,7 +77,11 @@ module ClaudeSwarm
         end
 
         # Generate and set session path for all instances
-        session_path = SessionPath.generate(working_dir: Dir.pwd)
+        session_path = if @provided_session_id
+          SessionPath.generate(working_dir: Dir.pwd, session_id: @provided_session_id)
+        else
+          SessionPath.generate(working_dir: Dir.pwd)
+        end
         SessionPath.ensure_directory(session_path)
         @session_path = session_path
 
@@ -131,29 +134,6 @@ module ClaudeSwarm
         save_swarm_config_path(session_path)
       end
 
-      # Execute before commands if specified
-      before_commands = @config.before_commands
-      if before_commands.any? && !@restore_session_path
-        unless @prompt
-          puts "⚙️  Executing before commands..."
-          puts
-        end
-
-        success = execute_before_commands(before_commands)
-        unless success
-          puts "❌ Before commands failed. Aborting swarm launch." unless @prompt
-          cleanup_processes
-          cleanup_run_symlink
-          cleanup_worktrees
-          exit 1
-        end
-
-        unless @prompt
-          puts "✓ Before commands completed successfully"
-          puts
-        end
-      end
-
       # Launch the main instance (fetch after worktree setup to get modified paths)
       main_instance = @config.main_instance_config
       unless @prompt
@@ -174,7 +154,7 @@ module ClaudeSwarm
 
       command = build_main_command(main_instance)
       if @debug && !@prompt
-        puts "Running: #{command}"
+        puts "🏃 Running: #{format_command_for_display(command)}"
         puts
       end
 
@@ -182,9 +162,36 @@ module ClaudeSwarm
       log_thread = nil
       log_thread = start_log_streaming if @prompt && @stream_logs
 
+      # Write the current process PID (orchestrator) to a file for easy access
+      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
-        system(*command)
+        # Execute before commands if specified
+        before_commands = @config.before_commands
+        if before_commands.any? && !@restore_session_path
+          unless @prompt
+            puts "⚙️  Executing before commands..."
+            puts
+          end
+
+          success = execute_before_commands?(before_commands)
+          unless success
+            puts "❌ Before commands failed. Aborting swarm launch." unless @prompt
+            cleanup_processes
+            cleanup_run_symlink
+            cleanup_worktrees
+            exit(1)
+          end
+
+          unless @prompt
+            puts "✓ Before commands completed successfully"
+            puts
+          end
+        end
+
+        system!(*command)
       end
 
       # Clean up log streaming thread
@@ -193,6 +200,27 @@ module ClaudeSwarm
         log_thread.join
       end
 
+      # Display runtime and cost summary
+      display_summary
+
+      # Execute after commands if specified
+      after_commands = @config.after_commands
+      if after_commands.any? && !@restore_session_path
+        Dir.chdir(main_instance[:directory]) do
+          unless @prompt
+            puts
+            puts "⚙️  Executing after commands..."
+            puts
+          end
+
+          success = execute_after_commands?(after_commands)
+          if !success && !@prompt
+            puts "⚠️  Some after commands failed"
+            puts
+          end
+        end
+      end
+
       # Clean up child processes and run symlink
       cleanup_processes
       cleanup_run_symlink
@@ -201,7 +229,7 @@ module ClaudeSwarm
 
     private
 
-    def execute_before_commands(commands)
+    def execute_before_commands?(commands)
       log_file = File.join(@session_path, "session.log") if @session_path
 
       commands.each_with_index do |command, index|
@@ -217,7 +245,7 @@ module ClaudeSwarm
           puts "Debug: Executing command #{index + 1}/#{commands.size}: #{command}" if @debug && !@prompt
 
           # Use system with output capture
-          output = `#{command} 2>&1`
+          output = %x(#{command} 2>&1)
           success = $CHILD_STATUS.success?
 
           # Log the output
@@ -256,6 +284,62 @@ module ClaudeSwarm
       true
     end
 
+    def execute_after_commands?(commands)
+      log_file = File.join(@session_path, "session.log") if @session_path
+      all_succeeded = true
+
+      commands.each_with_index do |command, index|
+        # Log the command execution to session log
+        if @session_path
+          File.open(log_file, "a") do |f|
+            f.puts "[#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}] Executing after command #{index + 1}/#{commands.size}: #{command}"
+          end
+        end
+
+        # Execute the command and capture output
+        begin
+          puts "Debug: Executing after command #{index + 1}/#{commands.size}: #{command}" if @debug && !@prompt
+
+          # Use system with output capture
+          output = %x(#{command} 2>&1)
+          success = $CHILD_STATUS.success?
+
+          # Log the output
+          if @session_path
+            File.open(log_file, "a") do |f|
+              f.puts "Command output:"
+              f.puts output
+              f.puts "Exit status: #{$CHILD_STATUS.exitstatus}"
+              f.puts "-" * 80
+            end
+          end
+
+          # Show output if in debug mode or if command failed
+          if (@debug || !success) && !@prompt
+            puts "After command #{index + 1} output:"
+            puts output
+            puts "Exit status: #{$CHILD_STATUS.exitstatus}"
+          end
+
+          unless success
+            puts "❌ After command #{index + 1} failed: #{command}" unless @prompt
+            all_succeeded = false
+          end
+        rescue StandardError => e
+          puts "Error executing after command #{index + 1}: #{e.message}" unless @prompt
+          if @session_path
+            File.open(log_file, "a") do |f|
+              f.puts "Error: #{e.message}"
+              f.puts "-" * 80
+            end
+          end
+          all_succeeded = false
+        end
+      end
+
+      all_succeeded
+    end
+
     def save_swarm_config_path(session_path)
       # Copy the YAML config file to the session directory
       config_copy_path = File.join(session_path, "config.yml")
@@ -269,8 +353,9 @@ module ClaudeSwarm
       metadata = {
         "start_directory" => Dir.pwd,
         "timestamp" => Time.now.utc.iso8601,
+        "start_time" => @start_time.utc.iso8601,
         "swarm_name" => @config.swarm_name,
-        "claude_swarm_version" => VERSION
+        "claude_swarm_version" => VERSION,
       }
 
       # Add worktree info if applicable
@@ -281,9 +366,23 @@ module ClaudeSwarm
     end
 
     def setup_signal_handlers
-      %w[INT TERM QUIT].each do |signal|
+      ["INT", "TERM", "QUIT"].each do |signal|
         Signal.trap(signal) do
           puts "\n🛑 Received #{signal} signal, cleaning up..."
+          display_summary
+
+          # Execute after commands if configured
+          main_instance = @config.main_instance_config
+          after_commands = @config.after_commands
+          if after_commands.any? && !@restore_session_path && !@prompt
+            Dir.chdir(main_instance[:directory]) do
+              puts
+              puts "⚙️  Executing after commands..."
+              puts
+              execute_after_commands?(after_commands)
+            end
+          end
+
           cleanup_processes
           cleanup_run_symlink
           cleanup_worktrees
@@ -307,6 +406,71 @@ module ClaudeSwarm
       puts "⚠️  Error during worktree cleanup: #{e.message}"
     end
 
+    def display_summary
+      return unless @session_path && @start_time
+
+      end_time = Time.now
+      runtime_seconds = (end_time - @start_time).to_i
+
+      # Update session metadata with end time
+      update_session_end_time(end_time)
+
+      # Calculate total cost from session logs
+      total_cost = calculate_total_cost
+
+      puts
+      puts "=" * 50
+      puts "🏁 Claude Swarm Summary"
+      puts "=" * 50
+      puts "Runtime: #{format_duration(runtime_seconds)}"
+      puts "Total Cost: #{format_cost(total_cost)}"
+      puts "Session: #{File.basename(@session_path)}"
+      puts "=" * 50
+    end
+
+    def update_session_end_time(end_time)
+      metadata_file = File.join(@session_path, "session_metadata.json")
+      return unless File.exist?(metadata_file)
+
+      metadata = JSON.parse(File.read(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))
+    rescue StandardError => e
+      puts "⚠️  Error updating session metadata: #{e.message}" unless @prompt
+    end
+
+    def calculate_total_cost
+      log_file = File.join(@session_path, "session.log.json")
+      result = SessionCostCalculator.calculate_total_cost(log_file)
+
+      # Check if main instance has cost data
+      main_instance_name = @config.main_instance
+      @main_has_cost = result[:instances_with_cost].include?(main_instance_name)
+
+      result[:total_cost]
+    end
+
+    def format_duration(seconds)
+      hours = seconds / 3600
+      minutes = (seconds % 3600) / 60
+      secs = seconds % 60
+
+      parts = []
+      parts << "#{hours}h" if hours.positive?
+      parts << "#{minutes}m" if minutes.positive?
+      parts << "#{secs}s"
+
+      parts.join(" ")
+    end
+
+    def format_cost(cost)
+      cost_str = format("$%.4f", cost)
+      cost_str += " (excluding main instance)" unless @main_has_cost
+      cost_str
+    end
+
     def create_run_symlink
       return unless @session_path
 
@@ -341,7 +505,7 @@ module ClaudeSwarm
         session_log_path = File.join(ENV.fetch("CLAUDE_SWARM_SESSION_PATH", nil), "session.log")
 
         # Wait for log file to be created
-        sleep 0.1 until File.exist?(session_log_path)
+        sleep(0.1) until File.exist?(session_log_path)
 
         # Open file and seek to end
         File.open(session_log_path, "r") do |file|
@@ -350,10 +514,10 @@ module ClaudeSwarm
           loop do
             changes = file.read
             if changes
-              print changes
+              print(changes)
               $stdout.flush
             else
-              sleep 0.1
+              sleep(0.1)
             end
           end
         end
@@ -362,11 +526,21 @@ module ClaudeSwarm
       end
     end
 
+    def format_command_for_display(command)
+      command.map do |part|
+        if part.match?(/\s|'|"/)
+          "'#{part.gsub("'", "'\\\\''")}'"
+        else
+          part
+        end
+      end.join(" ")
+    end
+
     def build_main_command(instance)
       parts = [
         "claude",
         "--model",
-        instance[:model]
+        instance[:model],
       ]
 
       # Add resume flag if restoring session
@@ -456,7 +630,9 @@ module ClaudeSwarm
       end
 
       # Restore worktrees using the saved configuration
-      @worktree_manager = WorktreeManager.new(worktree_data["shared_name"])
+      # Extract session ID from the session path
+      session_id = File.basename(session_path)
+      @worktree_manager = WorktreeManager.new(worktree_data["shared_name"], session_id: session_id)
 
       # Get all instances and restore their worktree paths
       all_instances = @config.instances.values

data/lib/claude_swarm/process_tracker.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "fileutils"
-
 module ClaudeSwarm
   class ProcessTracker
     PIDS_DIR = "pids"
@@ -39,7 +37,7 @@ module ClaudeSwarm
           puts "✓ Terminated MCP server: #{name} (PID: #{pid})"
 
           # Give it a moment to terminate gracefully
-          sleep 0.1
+          sleep(0.1)
 
           # Force kill if still running
           begin
@@ -62,11 +60,13 @@ module ClaudeSwarm
       FileUtils.rm_rf(@pids_dir)
     end
 
-    def self.cleanup_session(session_path)
-      return unless Dir.exist?(File.join(session_path, PIDS_DIR))
+    class << self
+      def cleanup_session(session_path)
+        return unless Dir.exist?(File.join(session_path, PIDS_DIR))
 
-      tracker = new(session_path)
-      tracker.cleanup_all
+        tracker = new(session_path)
+        tracker.cleanup_all
+      end
     end
 
     private

data/lib/claude_swarm/session_cost_calculator.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module ClaudeSwarm
+  module SessionCostCalculator
+    extend self
+
+    # Calculate total cost from session log file
+    # Returns a hash with:
+    # - total_cost: Total cost in USD
+    # - instances_with_cost: Set of instance names that have cost data
+    def calculate_total_cost(session_log_path)
+      return { total_cost: 0.0, instances_with_cost: Set.new } unless File.exist?(session_log_path)
+
+      total_cost = 0.0
+      instances_with_cost = Set.new
+
+      File.foreach(session_log_path) do |line|
+        data = JSON.parse(line)
+        if data.dig("event", "type") == "result" && (cost = data.dig("event", "total_cost_usd"))
+          total_cost += cost
+          instances_with_cost << data["instance"]
+        end
+      rescue JSON::ParserError
+        next
+      end
+
+      {
+        total_cost: total_cost,
+        instances_with_cost: instances_with_cost,
+      }
+    end
+
+    # Calculate simple total cost (for backward compatibility)
+    def calculate_simple_total(session_log_path)
+      calculate_total_cost(session_log_path)[:total_cost]
+    end
+
+    # Parse instance hierarchy with costs from session log
+    # Returns a hash of instances with their cost data and relationships
+    def parse_instance_hierarchy(session_log_path)
+      instances = {}
+
+      return instances unless File.exist?(session_log_path)
+
+      File.foreach(session_log_path) do |line|
+        data = JSON.parse(line)
+        instance_name = data["instance"]
+        instance_id = data["instance_id"]
+        calling_instance = data["calling_instance"]
+
+        # Initialize instance data
+        instances[instance_name] ||= {
+          name: instance_name,
+          id: instance_id,
+          cost: 0.0,
+          calls: 0,
+          called_by: Set.new,
+          calls_to: Set.new,
+          has_cost_data: false,
+        }
+
+        # Track relationships
+        if calling_instance && calling_instance != instance_name
+          instances[instance_name][:called_by] << calling_instance
+
+          instances[calling_instance] ||= {
+            name: calling_instance,
+            id: data["calling_instance_id"],
+            cost: 0.0,
+            calls: 0,
+            called_by: Set.new,
+            calls_to: Set.new,
+            has_cost_data: false,
+          }
+          instances[calling_instance][:calls_to] << instance_name
+        end
+
+        # Track costs and calls
+        if data.dig("event", "type") == "result"
+          instances[instance_name][:calls] += 1
+          if (cost = data.dig("event", "total_cost_usd"))
+            instances[instance_name][:cost] += cost
+            instances[instance_name][:has_cost_data] = true
+          end
+        end
+      rescue JSON::ParserError
+        next
+      end
+
+      instances
+    end
+  end
+end

data/lib/claude_swarm/session_path.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "fileutils"
-
 module ClaudeSwarm
   module SessionPath
     SESSIONS_DIR = "sessions"
@@ -26,10 +24,10 @@ module ClaudeSwarm
         path.gsub(%r{[/\\]}, "+")
       end
 
-      # Generate a full session path for a given directory and timestamp
-      def generate(working_dir: Dir.pwd, timestamp: Time.now.strftime("%Y%m%d_%H%M%S"))
+      # 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, timestamp)
+        File.join(swarm_home, SESSIONS_DIR, project_name, session_id)
       end
 
       # Ensure the session directory exists

data/lib/claude_swarm/system_utils.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module ClaudeSwarm
+  module SystemUtils
+    def system!(*args)
+      success = system(*args)
+      unless success
+        exit_status = $CHILD_STATUS&.exitstatus || 1
+        command_str = args.size == 1 ? args.first : args.join(" ")
+        warn("❌ Command failed with exit status: #{exit_status}")
+        raise Error, "Command failed with exit status #{exit_status}: #{command_str}"
+      end
+      success
+    end
+  end
+end