claude_swarm 0.1.17 → 0.1.19

data/lib/claude_swarm/commands/ps.rb

@@ -86,6 +86,11 @@ 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 all directories - handle both string and array formats
         dir_config = config.dig("swarm", "instances", main_instance, "directory")
         directories = if dir_config.is_a?(Array)
@@ -93,7 +98,16 @@ module ClaudeSwarm
                       else
                         [dir_config || "."]
                       end
-        directories_str = directories.join(", ")
+
+        # Expand paths relative to the base directory
+        expanded_directories = directories.map do |dir|
+          File.expand_path(dir, base_dir)
+        end
+
+        # Check for worktree information in session metadata
+        expanded_directories = apply_worktree_paths(expanded_directories, session_dir)
+
+        directories_str = expanded_directories.join(", ")
 
         # Calculate total cost from JSON log
         total_cost = calculate_total_cost(session_dir)
@@ -143,6 +157,44 @@ module ClaudeSwarm
       def truncate(str, length)
         str.length > length ? "#{str[0...length - 2]}.." : str
       end
+
+      def apply_worktree_paths(directories, session_dir)
+        session_metadata_file = File.join(session_dir, "session_metadata.json")
+        return directories unless File.exist?(session_metadata_file)
+
+        metadata = JSON.parse(File.read(session_metadata_file))
+        worktree_info = metadata["worktree"]
+        return directories unless worktree_info && worktree_info["enabled"]
+
+        # Get the created worktree paths
+        created_paths = worktree_info["created_paths"] || {}
+
+        # For each directory, find the appropriate worktree path
+        directories.map do |dir|
+          # Find if this directory has a worktree created
+          repo_root = find_git_root(dir)
+          next dir unless repo_root
+
+          # Look for a worktree with this repo root
+          worktree_key = created_paths.keys.find { |key| key.start_with?("#{repo_root}:") }
+          worktree_key ? created_paths[worktree_key] : dir
+        end
+      end
+
+      def worktree_path_for(dir, worktree_name)
+        git_root = find_git_root(dir)
+        git_root ? File.join(git_root, ".worktrees", worktree_name) : dir
+      end
+
+      def find_git_root(dir)
+        current = File.expand_path(dir)
+        while current != "/"
+          return current if File.exist?(File.join(current, ".git"))
+
+          current = File.dirname(current)
+        end
+        nil
+      end
     end
   end
 end

data/lib/claude_swarm/configuration.rb

@@ -26,6 +26,10 @@ module ClaudeSwarm
       instances[instance_name][:connections] || []
     end
 
+    def before_commands
+      @swarm["before"] || []
+    end
+
     private
 
     def load_and_validate
@@ -101,7 +105,8 @@ module ClaudeSwarm
         mcps: parse_mcps(config["mcps"] || []),
         prompt: config["prompt"],
         description: config["description"],
-        vibe: config["vibe"] || false
+        vibe: config["vibe"] || false,
+        worktree: parse_worktree_value(config["worktree"])
       }
     end
 
@@ -188,5 +193,13 @@ module ClaudeSwarm
     def expand_path(path)
       Pathname.new(path).expand_path(@base_dir).to_s
     end
+
+    def parse_worktree_value(value)
+      return nil if value.nil? # Omitted means follow CLI behavior
+      return value if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+      return value.to_s if value.is_a?(String) && !value.empty?
+
+      raise Error, "Invalid worktree value: #{value.inspect}. Must be true, false, or a non-empty string"
+    end
   end
 end

data/lib/claude_swarm/orchestrator.rb

@@ -1,17 +1,19 @@
 # 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
     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)
+                   restore_session_path: nil, worktree: nil)
       @config = configuration
       @generator = mcp_generator
       @vibe = vibe
@@ -20,6 +22,15 @@ module ClaudeSwarm
       @debug = debug
       @restore_session_path = restore_session_path
       @session_path = nil
+      # 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? }
+      # Store modified instances after worktree setup
+      @modified_instances = nil
+
+      # Set environment variable for prompt mode to suppress output
+      ENV["CLAUDE_SWARM_PROMPT"] = "1" if @prompt
     end
 
     def start
@@ -50,6 +61,9 @@ module ClaudeSwarm
         # Set up signal handlers to clean up child processes
         setup_signal_handlers
 
+        # Check if the original session used worktrees
+        restore_worktrees_if_needed(session_path)
+
         # Regenerate MCP configurations with session IDs for restoration
         @generator.generate_all
         unless @prompt
@@ -68,6 +82,9 @@ module ClaudeSwarm
         SessionPath.ensure_directory(session_path)
         @session_path = session_path
 
+        # Extract session ID from path (the timestamp part)
+        @session_id = File.basename(session_path)
+
         ENV["CLAUDE_SWARM_SESSION_PATH"] = session_path
         ENV["CLAUDE_SWARM_START_DIR"] = Dir.pwd
 
@@ -85,6 +102,24 @@ module ClaudeSwarm
         # Set up signal handlers to clean up child processes
         setup_signal_handlers
 
+        # Create WorktreeManager if needed with session ID
+        if @needs_worktree_manager
+          cli_option = @worktree_option.is_a?(String) && !@worktree_option.empty? ? @worktree_option : nil
+          @worktree_manager = WorktreeManager.new(cli_option, session_id: @session_id)
+          puts "🌳 Setting up Git worktrees..." unless @prompt
+
+          # Get all instances for worktree setup
+          # Note: instances.values already includes the main instance
+          all_instances = @config.instances.values
+
+          @worktree_manager.setup_worktrees(all_instances)
+
+          unless @prompt
+            puts "✓ Worktrees created with branch: #{@worktree_manager.worktree_name}"
+            puts
+          end
+        end
+
         # Generate all MCP configuration files
         @generator.generate_all
         unless @prompt
@@ -96,7 +131,30 @@ module ClaudeSwarm
         save_swarm_config_path(session_path)
       end
 
-      # Launch the main instance
+      # 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
         puts "🚀 Launching main instance: #{@config.main_instance}"
@@ -138,10 +196,66 @@ module ClaudeSwarm
       # Clean up child processes and run symlink
       cleanup_processes
       cleanup_run_symlink
+      cleanup_worktrees
     end
 
     private
 
+    def execute_before_commands(commands)
+      log_file = File.join(@session_path, "session.log") if @session_path
+
+      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 before command #{index + 1}/#{commands.size}: #{command}"
+          end
+        end
+
+        # Execute the command and capture output
+        begin
+          puts "Debug: Executing command #{index + 1}/#{commands.size}: #{command}" if @debug && !@prompt
+
+          # Use system with output capture
+          output = `#{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 "Command #{index + 1} output:"
+            puts output
+            puts "Exit status: #{$CHILD_STATUS.exitstatus}"
+          end
+
+          unless success
+            puts "❌ Before command #{index + 1} failed: #{command}" unless @prompt
+            return false
+          end
+        rescue StandardError => e
+          puts "Error executing before 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
+          return false
+        end
+      end
+
+      true
+    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")
@@ -150,6 +264,20 @@ module ClaudeSwarm
       # Save the original working directory
       start_dir_file = File.join(session_path, "start_directory")
       File.write(start_dir_file, Dir.pwd)
+
+      # Save session metadata
+      metadata = {
+        "start_directory" => Dir.pwd,
+        "timestamp" => Time.now.utc.iso8601,
+        "swarm_name" => @config.swarm_name,
+        "claude_swarm_version" => VERSION
+      }
+
+      # Add worktree info if applicable
+      metadata["worktree"] = @worktree_manager.session_metadata if @worktree_manager
+
+      metadata_file = File.join(session_path, "session_metadata.json")
+      File.write(metadata_file, JSON.pretty_generate(metadata))
     end
 
     def setup_signal_handlers
@@ -158,6 +286,7 @@ module ClaudeSwarm
           puts "\n🛑 Received #{signal} signal, cleaning up..."
           cleanup_processes
           cleanup_run_symlink
+          cleanup_worktrees
           exit
         end
       end
@@ -170,6 +299,14 @@ module ClaudeSwarm
       puts "⚠️  Error during cleanup: #{e.message}"
     end
 
+    def cleanup_worktrees
+      return unless @worktree_manager
+
+      @worktree_manager.cleanup_worktrees
+    rescue StandardError => e
+      puts "⚠️  Error during worktree cleanup: #{e.message}"
+    end
+
     def create_run_symlink
       return unless @session_path
 
@@ -304,5 +441,31 @@ module ClaudeSwarm
         parts << "#{instance[:prompt]}\n\nNow just say 'I am ready to start'"
       end
     end
+
+    def restore_worktrees_if_needed(session_path)
+      metadata_file = File.join(session_path, "session_metadata.json")
+      return unless File.exist?(metadata_file)
+
+      metadata = JSON.parse(File.read(metadata_file))
+      worktree_data = metadata["worktree"]
+      return unless worktree_data && worktree_data["enabled"]
+
+      unless @prompt
+        puts "🌳 Restoring Git worktrees..."
+        puts
+      end
+
+      # Restore worktrees using the saved configuration
+      @worktree_manager = WorktreeManager.new(worktree_data["shared_name"])
+
+      # Get all instances and restore their worktree paths
+      all_instances = @config.instances.values
+      @worktree_manager.setup_worktrees(all_instances)
+
+      return if @prompt
+
+      puts "✓ Worktrees restored with branch: #{@worktree_manager.worktree_name}"
+      puts
+    end
   end
 end

data/lib/claude_swarm/version.rb

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